diff --git a/Scripts/build_aggregate.sh b/Scripts/build_aggregate.sh index d3049bff..514d0075 100755 --- a/Scripts/build_aggregate.sh +++ b/Scripts/build_aggregate.sh @@ -27,5 +27,5 @@ mv ${UNIVERSAL_OUTPUTFOLDER}/${C_PROJECT_NAME} ${UNIVERSAL_OUTPUTFOLDER}/${C_PRO # For Swift framework, Swiftmodule needs to be copied in the universal framework if [ -d "${SIMULATOR_LIBRARY_PATH}/Modules/${C_PROJECT_NAME}.swiftmodule/" ]; then -cp -a "${SIMULATOR_LIBRARY_PATH}/Modules/${C_PROJECT_NAME}.swiftmodule/" "${UNIVERSAL_OUTPUTFOLDER}/${C_PROJECT_NAME}.framework/Modules/${C_PROJECT_NAME}.swiftmodule/" + cp -a "${SIMULATOR_LIBRARY_PATH}/Modules/${C_PROJECT_NAME}.swiftmodule/" "${UNIVERSAL_OUTPUTFOLDER}/${C_PROJECT_NAME}.framework/Modules/${C_PROJECT_NAME}.swiftmodule/" fi diff --git a/Scripts/download_dependencies.sh b/Scripts/download_dependencies.sh index 66742216..f03a25e8 100755 --- a/Scripts/download_dependencies.sh +++ b/Scripts/download_dependencies.sh @@ -15,7 +15,7 @@ BUILD_DIR=$(xcodebuild -showBuildSettings -project ./MVMCoreUI.xcodeproj | grep FRAMEWORKS_DIR=$BUILD_DIR/Frameworks if [ ! -d $FRAMEWORKS_DIR ]; then -mkdir $FRAMEWORKS_DIR + mkdir $FRAMEWORKS_DIR fi ./Scripts/download_framework.sh $ARTIFACTORY_URL "$FRAMEWORKS_DIR/MVMCore.framework" BPHV_MobileFirst_IOS/com/vzw/hss/myverizon/MVMCore/1.0/MVMCore-1.0-Debug-SNAPSHOT.zip diff --git a/Scripts/download_framework.sh b/Scripts/download_framework.sh index 7cc48bc2..9e9e2bb5 100755 --- a/Scripts/download_framework.sh +++ b/Scripts/download_framework.sh @@ -25,7 +25,7 @@ fi exit_with_error () { echo "Error: $1" if [ -f "${NEWFILEPATH}" ]; then -rm -rf "${NEWFILEPATH}" 2 + rm -rf "${NEWFILEPATH}" 2 fi exit 1 } @@ -37,11 +37,11 @@ echo -e "Local Target: ${LOCALPATH}" echo -e "Remote Source: ${REMOTEPATH}" if [ -z "$LOCALPATH" ]; then -exit_with_error "Missing local path argument" + exit_with_error "Missing local path argument" fi if [ -z "$REMOTEPATH" ]; then -exit_with_error "Missing filename path argument" + exit_with_error "Missing filename path argument" fi #get local and remote checksums for comparison @@ -50,37 +50,37 @@ echo -e "URL: ${URL}/api/storage/${REMOTEPATH}" JSON=$(curl --header "X-JFrog-Art-Api: ${ARTIFACTORY_APIKEY}" -X GET "${URL}/api/storage/${REMOTEPATH}") CHECKSUM=$(echo "$JSON" | python -c 'import sys, json; print json.load(sys.stdin)["checksums"]["sha1"]') if [[ -z "$CHECKSUM" ]]; then -exit_with_error "No Checksum found in json: ${JSON}" + exit_with_error "No Checksum found in json: ${JSON}" fi echo "Remote checksum ${CHECKSUM}" if [[ -f "${VERSIONFILE}" ]]; then -OLDCHECKSUM=$(cat "${VERSIONFILE}") + OLDCHECKSUM=$(cat "${VERSIONFILE}") else -OLDCHECKSUM="none" -mkdir -p $(dirname ${VERSIONFILE}) && touch "$VERSIONFILE" + OLDCHECKSUM="none" + mkdir -p $(dirname ${VERSIONFILE}) && touch "$VERSIONFILE" fi echo "Local checksum ${OLDCHECKSUM}" #get new framework if no original framework, no local checksum, or remote checksum is different from local. if [ ! -e "${LOCALPATH}" ] || [ -z "$OLDCHECKSUM" ] || [ "$CHECKSUM" != "$OLDCHECKSUM" ]; then -echo "Downloading..." -echo -e "URL: ${URL}/${REMOTEPATH}" -curl --header "X-JFrog-Art-Api: ${ARTIFACTORY_APIKEY}" -f -X GET "$URL/$REMOTEPATH" --output "${NEWFILEPATH}" -if [ $? -eq 0 ] && [ -e "${NEWFILEPATH}" ]; then -echo "Finished Downloading, begin unzip" -unzip -q -o "${NEWFILEPATH}" -d "${LOCALDIR}" -if [ $? -eq 0 ]; then -echo "Finished unzipping, remove zip" -rm -rf "${NEWFILEPATH}" -echo "Writing new checksum to file" -echo "${CHECKSUM}" > "${VERSIONFILE}" -echo "Successfully downloaded and unzipped archive." + echo "Downloading..." + echo -e "URL: ${URL}/${REMOTEPATH}" + curl --header "X-JFrog-Art-Api: ${ARTIFACTORY_APIKEY}" -f -X GET "$URL/$REMOTEPATH" --output "${NEWFILEPATH}" + if [ $? -eq 0 ] && [ -e "${NEWFILEPATH}" ]; then + echo "Finished Downloading, begin unzip" + unzip -q -o "${NEWFILEPATH}" -d "${LOCALDIR}" + if [ $? -eq 0 ]; then + echo "Finished unzipping, remove zip" + rm -rf "${NEWFILEPATH}" + echo "Writing new checksum to file" + echo "${CHECKSUM}" > "${VERSIONFILE}" + echo "Successfully downloaded and unzipped archive." + else + exit_with_error "Error unzipping" + fi + else + exit_with_error "Failed to download" + fi else -exit_with_error "Error unzipping" -fi -else -exit_with_error "Failed to download" -fi -else -echo "Successful, No New Version" + echo "Successful, No New Version" fi diff --git a/Scripts/upload_framework.sh b/Scripts/upload_framework.sh index 94a6007b..305a6585 100755 --- a/Scripts/upload_framework.sh +++ b/Scripts/upload_framework.sh @@ -59,16 +59,16 @@ zip -r -X "${LOCALBASE}.zip" $LOCALBASE CHECKSUM=$(shasum -a 1 "${LOCALBASE}.zip" | cut -d " " -f 1) echo -e "SHA-1 Checksum: \t${CHECKSUM}" if [ -e ${LOCALBASE}.dSYM ]; then -echo -e "---------\nZipping: \t\t${LOCALBASE}.dSYM.zip" -zip -r -X "${LOCALBASE}.dSYM.zip" $LOCALBASE.dSYM -# Generate its SHA-1 checksum for dsym. -DSYM_CHECKSUM=$(shasum -a 1 "${LOCALBASE}.dSYM.zip" | cut -d " " -f 1) -echo -e "SHA-1 Checksum: \t${DSYM_CHECKSUM}" + echo -e "---------\nZipping: \t\t${LOCALBASE}.dSYM.zip" + zip -r -X "${LOCALBASE}.dSYM.zip" $LOCALBASE.dSYM + # Generate its SHA-1 checksum for dsym. + DSYM_CHECKSUM=$(shasum -a 1 "${LOCALBASE}.dSYM.zip" | cut -d " " -f 1) + echo -e "SHA-1 Checksum: \t${DSYM_CHECKSUM}" fi popd mv ${LOCALPATH}.zip . if [ -e ${LOCALPATH}.dSYM.zip ]; then -mv ${LOCALPATH}.dSYM.zip . + mv ${LOCALPATH}.dSYM.zip . fi # Upload framework to Artifactory. @@ -79,12 +79,11 @@ curl --header "X-JFrog-Art-Api: ${APIKEY}" --header "X-Checksum-Sha1: ${CHECKSUM rm "${LOCALBASE}.zip" if [ -e ${LOCALBASE}.dSYM.zip ]; then -# Upload dsym Artifactory. -echo -e "---------\nUploading to: \t\t${URL}/${REMOTEPATH}.dSYM.zip" -curl --header "X-JFrog-Art-Api: ${APIKEY}" --header "X-Checksum-Sha1: ${DSYM_CHECKSUM}" -X PUT "${URL}/${REMOTEPATH}.dSYM.zip" -T "${LOCALBASE}.dSYM.zip" -# Cleanup dsym. -rm ${LOCALBASE}.dSYM.zip + # Upload dsym Artifactory. + echo -e "---------\nUploading to: \t\t${URL}/${REMOTEPATH}.dSYM.zip" + curl --header "X-JFrog-Art-Api: ${APIKEY}" --header "X-Checksum-Sha1: ${DSYM_CHECKSUM}" -X PUT "${URL}/${REMOTEPATH}.dSYM.zip" -T "${LOCALBASE}.dSYM.zip" + # Cleanup dsym. + rm ${LOCALBASE}.dSYM.zip fi - echo -e "\n\n<<< UPLOAD COMPLETE >>>\n\n"