diff options
| -rwxr-xr-x | Scripts/build.sh | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/Scripts/build.sh b/Scripts/build.sh index 8b0e27d1..aae730a6 100755 --- a/Scripts/build.sh +++ b/Scripts/build.sh @@ -11,24 +11,27 @@ ## into Xcode's 'Run Scripts' build phase to make it easier to work with. As such this script ## can only be run by Xcode. +BUILD_PRODUCT="${BUILT_PRODUCTS_DIR}/${TARGET_NAME}${WRAPPER_SUFFIX}" + # Add the build/bundle version "${SRCROOT}/Scripts/build-version.pl" # Trim the application if this is a 'Release' or 'Distribution' build if [[ "$CONFIGURATION" == 'Release' || "$CONFIGURATION" == 'Distribution' ]] then - "${SRCROOT}/Scripts/trim-application.sh" -p "${BUILT_PRODUCTS_DIR}/${TARGET_NAME}${WRAPPER_SUFFIX}" -a + "${SRCROOT}/Scripts/trim-application.sh" -p "$BUILD_PRODUCT" -a fi # Perform distribution specific tasks if this is a 'Distribution' build if [ "$CONFIGURATION" == 'Distribution' ] then - codesign -s 'Sequel Pro Distribution' "${BUILT_PRODUCTS_DIR}/${TARGET_NAME}${WRAPPER_SUFFIX}/Contents/Resources/SequelProTunnelAssistant" 2> /dev/null - codesign -s 'Sequel Pro Distribution' "${BUILT_PRODUCTS_DIR}/${TARGET_NAME}${WRAPPER_SUFFIX}" 2> /dev/null + codesign -s 'Sequel Pro Distribution' "${BUILD_PRODUCT}/Contents/Resources/SequelProTunnelAssistant" 2> /dev/null + codesign -s 'Sequel Pro Distribution' "${BUILD_PRODUCT}" 2> /dev/null # Verify that code signing has worked - all distribution builds must be signed with the same key. - VERIFYERRORS=`codesign --verify "${BUILT_PRODUCTS_DIR}/${TARGET_NAME}${WRAPPER_SUFFIX}" 2>&1` - VERIFYERRORS+=`codesign --verify "${BUILT_PRODUCTS_DIR}/${TARGET_NAME}${WRAPPER_SUFFIX}/Contents/Resources/SequelProTunnelAssistant" 2>&1` + VERIFYERRORS=`codesign --verify "$BUILD_PRODUCT" 2>&1` + VERIFYERRORS+=`codesign --verify "${BUILD_PRODUCT}/Contents/Resources/SequelProTunnelAssistant" 2>&1` + if [ "$VERIFYERRORS" != '' ] then echo "error: Signing verification threw an error: $VERIFYERRORS" @@ -36,17 +39,17 @@ then exit 1 fi - "${SRCROOT}/Scripts/package-application.sh" -p "${BUILT_PRODUCTS_DIR}/${TARGET_NAME}${WRAPPER_SUFFIX}" + "${SRCROOT}/Scripts/package-application.sh" -p "$BUILD_PRODUCT" fi # Development build code signing if [ "$CONFIGURATION" == 'Debug' ] then - codesign -s 'Sequel Pro Development' "${BUILT_PRODUCTS_DIR}/${TARGET_NAME}${WRAPPER_SUFFIX}/Contents/Resources/SequelProTunnelAssistant" 2> /dev/null - codesign -s 'Sequel Pro Development' "${BUILT_PRODUCTS_DIR}/${TARGET_NAME}${WRAPPER_SUFFIX}" 2> /dev/null + codesign -s 'Sequel Pro Development' "${BUILD_PRODUCT}/Contents/Resources/SequelProTunnelAssistant" 2> /dev/null + codesign -s 'Sequel Pro Development' "$BUILD_PRODUCT" 2> /dev/null # Run a fake command to silence errors - touch "${BUILT_PRODUCTS_DIR}/${TARGET_NAME}${WRAPPER_SUFFIX}" + touch "$BUILD_PRODUCT" fi exit 0 |