From 82b5f4b637ef2096fa8f8e34e566985d0b57be2f Mon Sep 17 00:00:00 2001 From: Scott Pfeil Date: Tue, 5 Jul 2022 17:34:15 -0400 Subject: [PATCH] pass the version to upload script --- Scripts/upload_core_ui_frameworks.sh | 2 +- Scripts/upload_framework.sh | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Scripts/upload_core_ui_frameworks.sh b/Scripts/upload_core_ui_frameworks.sh index acdba191..a8cf475b 100755 --- a/Scripts/upload_core_ui_frameworks.sh +++ b/Scripts/upload_core_ui_frameworks.sh @@ -22,4 +22,4 @@ fi # Upload BUILD_DIR=$(echo "$BUILD_SETTINGS" | grep -w -o 'BUILD_DIR = .*' | cut -d\ -f3-) -./upload_framework.sh $ARTIFACTORY_URL "${BUILD_DIR}/universal/MVMCoreUI.xcframework" BPHV_MobileFirst_IOS/com/vzw/hss/myverizon/MVMCoreUI/[VER]/MVMCoreUI-[VER]-Debug-SNAPSHOT +./upload_framework.sh $ARTIFACTORY_URL "${BUILD_DIR}/universal/MVMCoreUI.xcframework" BPHV_MobileFirst_IOS/com/vzw/hss/myverizon/MVMCoreUI/[VER]/MVMCoreUI-[VER]-Debug-SNAPSHOT $FRAMEWORK_VERSION diff --git a/Scripts/upload_framework.sh b/Scripts/upload_framework.sh index 305a6585..8793960e 100755 --- a/Scripts/upload_framework.sh +++ b/Scripts/upload_framework.sh @@ -14,6 +14,7 @@ URL=$1 LOCALPATH=$2 REMOTEPATH=$3 +FRAMEWORKVER=$4 if [ -z $URL ]; then echo "The artifactory instance url must be specified as the first argument!" @@ -29,10 +30,6 @@ cat "${LOCALPATH}/Info.plist" LOCALBASE=$(basename "${LOCALPATH}") LOCALDIR=$(dirname "${LOCALPATH}") -# Grab the framework version from the bundled Info.plist. -FRAMEWORKVER=$(/usr/libexec/plistbuddy -c "Print :CFBundleShortVersionString" "${LOCALPATH}/Info.plist") -echo -e "\nFramework version: \t${FRAMEWORKVER}" - # Replace the [VER] placeholders with the found version. REMOTEPATH="${REMOTEPATH//\[VER\]/$FRAMEWORKVER}" echo -e "Resolved path: \t\t${REMOTEPATH}"