From 055446a0036685c6269e5f09f31a089d2aadcb56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20G=C3=A4rtner?= Date: Sat, 13 Jan 2018 18:38:29 +0100 Subject: [PATCH 1/2] Update compile --- bin/compile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/compile b/bin/compile index 8a71fa89..fd7b3c28 100755 --- a/bin/compile +++ b/bin/compile @@ -37,7 +37,7 @@ BUILDPACK_DIR=$(cd -P -- "$(dirname -- "$0")" && cd .. && pwd -P) # Get the directory our app is checked out in (the "BUILD_DIR"), passed by Heroku APP_CHECKOUT_DIR=$1 CACHE_DIR=$2 -if [ -n "${BUILDPACK_CLEAR_CACHE+1}" ]; then +if [ -n "$BUILDPACK_CLEAR_CACHE" ]; then echo "-----> Clearing cache dir." rm -rf "$CACHE_DIR/*" fi @@ -233,7 +233,7 @@ done # # Clear cache after build is done # -if [ -n "${BUILDPACK_CLEAR_CACHE+1}" ]; then +if [ -n "$BUILDPACK_CLEAR_CACHE" ]; then echo "-----> Clearing cache dir." rm -rf $METEOR_DIR fi From f6f37f5629d36102beedf3df6cc5fc01901e0666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20G=C3=A4rtner?= Date: Tue, 28 Aug 2018 17:15:01 +0200 Subject: [PATCH 2/2] Fix more incorrect flag checks --- bin/compile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/compile b/bin/compile index fd7b3c28..8deb398e 100755 --- a/bin/compile +++ b/bin/compile @@ -27,7 +27,7 @@ export_env_dir $3 # Enable verbose debugging if configured to -- though this has to come after # we've loaded environment configs. -if [ -n "${BUILDPACK_VERBOSE+1}" ]; then +if [ -n "$BUILDPACK_VERBOSE" ]; then set -x fi @@ -178,7 +178,7 @@ fi # https://github.com/meteor/meteor/issues/2606. Some packages only build their # assets at runtime, and thus they are not available for bundling unless meteor # has been launched. To opt-in to this, set BUILDPACK_PRELAUNCH_METEOR=1. -if [ -n "${BUILDPACK_PRELAUNCH_METEOR+1}" ]; then +if [ -n "$BUILDPACK_PRELAUNCH_METEOR" ]; then echo "-----> BUILDPACK_PRELAUNCH_METEOR: Pre-launching meteor to build packages assets" # Remove the Android platform because it fails due to the Android tools not # being installed, but leave the iOS platform because it's ignored.