From ade0a24b899cdc18f55b42e64a0aa650a35d81fd Mon Sep 17 00:00:00 2001 From: amarcu5 Date: Tue, 14 Mar 2017 18:52:29 +0000 Subject: [PATCH] Updated build script Now uses bash, changed indentation to 2 spaces --- make.sh | 23 ++++++++++++----------- out/PiPer.safariextz | Bin 7848 -> 10170 bytes update.plist | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/make.sh b/make.sh index 95ca1bf..18f4710 100755 --- a/make.sh +++ b/make.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Settings @@ -24,7 +24,8 @@ PRIVATE_KEY_PATH="../certs/privatekey.pem" # # Set working directory to project root -cd $(cd -P -- "$(dirname -- "$0")" && pwd -P) +project_root=$(cd -P -- "$(dirname -- "$0")" && pwd -P) +cd "$project_root" || exit # Remove output folder rm -rf out @@ -40,12 +41,12 @@ ${SVGO_PATH} -q -f "out/${EXTENSION_NAME}.safariextension/images" # Use closure compiler to compress javascript ${CCJS_PATH} out/${EXTENSION_NAME}.safariextension/scripts/main.js \ - --compilation_level=ADVANCED_OPTIMIZATIONS \ - --warning_level=VERBOSE \ - --externs="out/${EXTENSION_NAME}.safariextension/scripts/externs.js" \ - --new_type_inf \ - --use_types_for_optimization \ - > out/${EXTENSION_NAME}.safariextension/scripts/main.min.js + --compilation_level=ADVANCED_OPTIMIZATIONS \ + --warning_level=VERBOSE \ + --externs="out/${EXTENSION_NAME}.safariextension/scripts/externs.js" \ + --new_type_inf \ + --use_types_for_optimization \ + > out/${EXTENSION_NAME}.safariextension/scripts/main.min.js mv out/${EXTENSION_NAME}.safariextension/scripts/main.min.js out/${EXTENSION_NAME}.safariextension/scripts/main.js rm out/${EXTENSION_NAME}.safariextension/scripts/externs.js @@ -63,11 +64,11 @@ ${PLISTBUDDY_PATH} -c "Set \":Extension Updates:0:CFBundleVersion\" $number_of_c ${PLISTBUDDY_PATH} -c "Set \":Extension Updates:0:CFBundleShortVersionString\" ${git_release_version#*v}" "$update_plist" # Package safari extension -cd out -if [[ ${XARJS_PATH} != /* ]]; then if ! [ command -v "${XARJS_PATH}" >/dev/null 2>&1 ]; then XARJS_PATH="../${XARJS_PATH}"; fi; fi +cd out || exit +[[ ${XARJS_PATH} != /* ]] && ! command -v "${XARJS_PATH}" >/dev/null 2>&1 && XARJS_PATH="../${XARJS_PATH}" ${XARJS_PATH} create "${EXTENSION_NAME}.safariextz" --cert "${LEAF_CERT_PATH}" --cert "${INTERMEDIATE_CERT_PATH}" --cert "${ROOT_CERT_PATH}" --private-key "${PRIVATE_KEY_PATH}" "${EXTENSION_NAME}.safariextension" # Remove unpacked extension -if [ -f "${PRIVATE_KEY_PATH}" ]; then rm -rf "${EXTENSION_NAME}.safariextension"; fi +[ -f "${PRIVATE_KEY_PATH}" ] && rm -rf "${EXTENSION_NAME}.safariextension" echo "Done." diff --git a/out/PiPer.safariextz b/out/PiPer.safariextz index 9bfdd10d6a7ca470879fed4d59312c0d79cfb2e1..c5e2e86b663744a6874cf65d6a6576cc999c6d25 100644 GIT binary patch delta 7128 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 T4pNgb8oIO07as$&HX?)tZX8Dq diff --git a/update.plist b/update.plist index bbb3ce2..cf210a2 100644 --- a/update.plist +++ b/update.plist @@ -10,7 +10,7 @@ CFBundleShortVersionString 0.1.1 CFBundleVersion - 10 + 11 Developer Identifier BQ6Q24MF9X URL