From 47eae55d3c22993e32d98021c3f513ae59ce7288 Mon Sep 17 00:00:00 2001 From: Oskari Okko Ojala Date: Thu, 27 Feb 2014 13:46:31 +0200 Subject: [PATCH 01/16] WORDPRESS_LANGUAGE is not a used environment variable From 423d2e2b24bd83d63d3985904e847c07339ed353 Mon Sep 17 00:00:00 2001 From: Oskari Okko Ojala Date: Thu, 27 Feb 2014 13:46:31 +0200 Subject: [PATCH 02/16] WORDPRESS_LANGUAGE is not a used environment variable From 61a7b2afa71670f401ffcb5b7dfdb892f3b18120 Mon Sep 17 00:00:00 2001 From: Oskari Okko Ojala Date: Thu, 27 Feb 2014 13:49:23 +0200 Subject: [PATCH 03/16] Language support is not needed in the buildpack. Install wanted language into wp-content/ and set it in wp-config.php. The core is the same for all languages. Conflicts: bin/compile --- bin/compile | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/compile b/bin/compile index 30b7de0f..d3928631 100755 --- a/bin/compile +++ b/bin/compile @@ -46,7 +46,6 @@ fi NGINX_URL="https://s3.amazonaws.com/${S3_BUCKET}/nginx-${NGINX_VERSION}-heroku.tar.gz" PHP_URL="https://s3.amazonaws.com/${S3_BUCKET}/php-${PHP_VERSION}-with-fpm-heroku.tar.gz" WORDPRESS_URL="http://wordpress.org/wordpress-${WORDPRESS_VERSION}.tar.gz" -# function indent() { c='s/^/ /' From f3115449e3a5841666c7a197e1dc89a875858a37 Mon Sep 17 00:00:00 2001 From: Oskari Okko Ojala Date: Tue, 11 Mar 2014 15:09:04 +0200 Subject: [PATCH 04/16] prefix env variables with BUILDPACK_ Conflicts: bin/compile --- bin/compile | 54 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 21 deletions(-) diff --git a/bin/compile b/bin/compile index d3928631..7b5f5082 100755 --- a/bin/compile +++ b/bin/compile @@ -18,34 +18,46 @@ export_env_dir $3 # START CONFIG -# Support end-user configured NGINX_VERSION, PHP_VERSION, WORDPRESS_VERSION, -# S3_BUCKET environment variables. This way, end-users +# Support end-user configured BUILDPACK_NGINX_VERSION, BUILDPACK_PHP_VERSION, BUILDPACK_WORDPRESS_VERSION, +# BUILDPACK_S3_BUCKET, BUILDPACK_WORDPRESS_DIR environment variables. This way, end-users # can choose exactly which versions to run with. Requires user-env-compile for now, # but will continue to work when Heroku deprecates user-env-compile and ENV_DIR # appears to this script as a parameter. -if [ -z "$NGINX_VERSION" ]; then - NGINX_VERSION=1.4.2 +if [ -z "$BUILDPACK_NGINX_VERSION" ]; then + BUILDPACK_NGINX_VERSION=1.4.2 fi -if [ -z "$PHP_VERSION" ]; then - PHP_VERSION=5.5.2 +if [ -z "$BUILDPACK_PHP_VERSION" ]; then + BUILDPACK_PHP_VERSION=5.5.2 fi -if [ -z "$WORDPRESS_VERSION" ]; then - WORDPRESS_VERSION=3.9.1 +if [ -z "$BUILDPACK_WORDPRESS_VERSION" ]; then + BUILDPACK_WORDPRESS_VERSION=3.9.1 fi -if [ -z "$S3_BUCKET" ]; then - S3_BUCKET=heroku-buildpack-wordpress +if [ -z "$BUILDPACK_S3_BUCKET" ]; then + BUILDPACK_S3_BUCKET=heroku-buildpack-wordpress +fi + + +# Prevent publishing if old environment variables set. This feature will be removed in the future +# and thus the "global names" used before will be for application use. +if [ -z "$NGINX_VERSION" || -z "$PHP_VERSION" || -z "$WORDPRESS_VERSION" || -z "$S3_BUCKET" || -z "$WORDPRESS_DIR" ]; then + echo "Aborting. Env variables controlling buildpack should be prefixed with \"BUILDPACK_\"." + echo "Rename the variables and push again. For example:" + echo "" + echo " heroku config:set BUILDPACK_WORDPRESS_VERSION" + echo " heroku config:unset WORDPRESS_VERSION=x.x.x" + exit 250 fi # END CONFIG # -NGINX_URL="https://s3.amazonaws.com/${S3_BUCKET}/nginx-${NGINX_VERSION}-heroku.tar.gz" -PHP_URL="https://s3.amazonaws.com/${S3_BUCKET}/php-${PHP_VERSION}-with-fpm-heroku.tar.gz" -WORDPRESS_URL="http://wordpress.org/wordpress-${WORDPRESS_VERSION}.tar.gz" +NGINX_URL="https://s3.amazonaws.com/${BUILDPACK_S3_BUCKET}/nginx-${BUILDPACK_NGINX_VERSION}-heroku.tar.gz" +PHP_URL="https://s3.amazonaws.com/${BUILDPACK_S3_BUCKET}/php-${BUILDPACK_PHP_VERSION}-with-fpm-heroku.tar.gz" +WORDPRESS_URL="http://wordpress.org/wordpress-${BUILDPACK_WORDPRESS_VERSION}.tar.gz" function indent() { c='s/^/ /' @@ -62,7 +74,7 @@ mkdir -p $BUILD_DIR $CACHE_DIR # Nginx cd ${BUILD_DIR} if [ ! -d ./vendor/nginx ]; then - echo "-----> Installing Nginx v${NGINX_VERSION}" + echo "-----> Installing Nginx v${BUILDPACK_NGINX_VERSION}" mkdir -p ./vendor/nginx && cd ./vendor/nginx curl --silent --max-time 60 --location $NGINX_URL | tar xz fi @@ -70,24 +82,24 @@ fi # PHP cd ${BUILD_DIR} if [ ! -d ./vendor/php ]; then - echo "-----> Installing PHP v${PHP_VERSION}" + echo "-----> Installing PHP v${BUILDPACK_PHP_VERSION}" mkdir -p ./vendor/php && cd ./vendor/php curl --silent --max-time 60 --location $PHP_URL | tar xz fi # WordPress -echo "-----> Installing WordPress v${WORDPRESS_VERSION}" +echo "-----> Installing Wordpress v${BUILDPACK_WORDPRESS_VERSION}" cd ${BUILD_DIR} curl --silent --max-time 60 --location $WORDPRESS_URL | tar xz # Support installation of WordPress into a subdirectory instead of the docroot -if [ -n "$WORDPRESS_DIR" ]; then - echo " Installing to subdirectory ${WORDPRESS_DIR}" +if [ -n "$BUILDPACK_WORDPRESS_DIR" ]; then + echo "-----> BUILDPACK_WORDPRESS_DIR is set to ${BUILDPACK_WORDPRESS_DIR}" mkdir "public" - mv wordpress "public/$WORDPRESS_DIR" - WORDPRESS_INSTALLATION_DIR="public/$WORDPRESS_DIR" + mv wordpress "public/$BUILDPACK_WORDPRESS_DIR" + WORDPRESS_INSTALLATION_DIR="public/$BUILDPACK_WORDPRESS_DIR" else - echo " WORDPRESS_DIR not set. Installing WordPress to /" + echo "-----> BUILDPACK_WORDPRESS_DIR not set. Installing WordPress to /" mv wordpress public WORDPRESS_INSTALLATION_DIR="public" fi From 5a501549fd7d33a7e0e27081efb875d417a32bfb Mon Sep 17 00:00:00 2001 From: Oskari Okko Ojala Date: Tue, 11 Mar 2014 15:12:21 +0200 Subject: [PATCH 05/16] prefix env variables with BUILDPACK_, fix bash syntax --- bin/compile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index 7b5f5082..0f80d37b 100755 --- a/bin/compile +++ b/bin/compile @@ -43,7 +43,7 @@ fi # Prevent publishing if old environment variables set. This feature will be removed in the future # and thus the "global names" used before will be for application use. -if [ -z "$NGINX_VERSION" || -z "$PHP_VERSION" || -z "$WORDPRESS_VERSION" || -z "$S3_BUCKET" || -z "$WORDPRESS_DIR" ]; then +if [ -z "$NGINX_VERSION" ] || [ -z "$PHP_VERSION" ] || [ -z "$WORDPRESS_VERSION" ] || [ -z "$S3_BUCKET" ] || [ -z "$WORDPRESS_DIR" ]; then echo "Aborting. Env variables controlling buildpack should be prefixed with \"BUILDPACK_\"." echo "Rename the variables and push again. For example:" echo "" From 6889caf71cce39edb596dc7dd8f304a32251075f Mon Sep 17 00:00:00 2001 From: Oskari Okko Ojala Date: Tue, 11 Mar 2014 15:16:42 +0200 Subject: [PATCH 06/16] prefix env variables with BUILDPACK_, fix bash test operators --- bin/compile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index 0f80d37b..1cc36d14 100755 --- a/bin/compile +++ b/bin/compile @@ -43,7 +43,7 @@ fi # Prevent publishing if old environment variables set. This feature will be removed in the future # and thus the "global names" used before will be for application use. -if [ -z "$NGINX_VERSION" ] || [ -z "$PHP_VERSION" ] || [ -z "$WORDPRESS_VERSION" ] || [ -z "$S3_BUCKET" ] || [ -z "$WORDPRESS_DIR" ]; then +if [ -n "$NGINX_VERSION" ] || [ -n "$PHP_VERSION" ] || [ -n "$WORDPRESS_VERSION" ] || [ -n "$S3_BUCKET" ] || [ -n "$WORDPRESS_DIR" ]; then echo "Aborting. Env variables controlling buildpack should be prefixed with \"BUILDPACK_\"." echo "Rename the variables and push again. For example:" echo "" From 5f6f06545165aa43c72724550fe2ed147bc1e195 Mon Sep 17 00:00:00 2001 From: Oskari Okko Ojala Date: Tue, 11 Mar 2014 15:34:49 +0200 Subject: [PATCH 07/16] better instructions --- bin/compile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/compile b/bin/compile index 1cc36d14..0475098c 100755 --- a/bin/compile +++ b/bin/compile @@ -45,6 +45,8 @@ fi # and thus the "global names" used before will be for application use. if [ -n "$NGINX_VERSION" ] || [ -n "$PHP_VERSION" ] || [ -n "$WORDPRESS_VERSION" ] || [ -n "$S3_BUCKET" ] || [ -n "$WORDPRESS_DIR" ]; then echo "Aborting. Env variables controlling buildpack should be prefixed with \"BUILDPACK_\"." + echo "This applies to variables NGINX_VERSION, PHP_VERSION, WORDPRESS_VERSION, S3_BUCKET, WORDPRESS_DIR." + echo "" echo "Rename the variables and push again. For example:" echo "" echo " heroku config:set BUILDPACK_WORDPRESS_VERSION" From eb6e389b701f209ca50522e019667c5fb61a40f5 Mon Sep 17 00:00:00 2001 From: Oskari Okko Ojala Date: Tue, 11 Mar 2014 15:50:03 +0200 Subject: [PATCH 08/16] Even better instructions --- bin/compile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/compile b/bin/compile index 0475098c..01b2a339 100755 --- a/bin/compile +++ b/bin/compile @@ -47,10 +47,12 @@ if [ -n "$NGINX_VERSION" ] || [ -n "$PHP_VERSION" ] || [ -n "$WORDPRESS_VERSION" echo "Aborting. Env variables controlling buildpack should be prefixed with \"BUILDPACK_\"." echo "This applies to variables NGINX_VERSION, PHP_VERSION, WORDPRESS_VERSION, S3_BUCKET, WORDPRESS_DIR." echo "" - echo "Rename the variables and push again. For example:" + echo "Rename/remove the variables and push again. For example:" echo "" - echo " heroku config:set BUILDPACK_WORDPRESS_VERSION" - echo " heroku config:unset WORDPRESS_VERSION=x.x.x" + echo " heroku config:set BUILDPACK_WORDPRESS_VERSION=3.8.1" + echo " heroku config:set BUILDPACK_WORDPRESS_DIR=wordpress" + echo " heroku config:unset WORDPRESS_VERSION" + echo " heroku config:unset WORDPRESS_DIR" exit 250 fi From a1fb2ec08f31960318aaf926e0798d5bee6bc3a0 Mon Sep 17 00:00:00 2001 From: Oskari Okko Ojala Date: Mon, 17 Mar 2014 13:20:22 +0200 Subject: [PATCH 09/16] better conversion instructions --- bin/compile | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/bin/compile b/bin/compile index 01b2a339..bd5aaf33 100755 --- a/bin/compile +++ b/bin/compile @@ -47,12 +47,43 @@ if [ -n "$NGINX_VERSION" ] || [ -n "$PHP_VERSION" ] || [ -n "$WORDPRESS_VERSION" echo "Aborting. Env variables controlling buildpack should be prefixed with \"BUILDPACK_\"." echo "This applies to variables NGINX_VERSION, PHP_VERSION, WORDPRESS_VERSION, S3_BUCKET, WORDPRESS_DIR." echo "" - echo "Rename/remove the variables and push again. For example:" + echo "Rename/remove the variables and then push again:" echo "" - echo " heroku config:set BUILDPACK_WORDPRESS_VERSION=3.8.1" - echo " heroku config:set BUILDPACK_WORDPRESS_DIR=wordpress" - echo " heroku config:unset WORDPRESS_VERSION" - echo " heroku config:unset WORDPRESS_DIR" + if [ -n "$NGINX_VERSION" ]; then + if [-z "BUILDPACK_NGINX_VERSION" ]; then + echo " heroku config:set BUILDPACK_NGINX_VERSION=$NGINX_VERSION" + fi + echo " heroku config:unset NGINX_VERSION" + fi + + if [ -n "$PHP_VERSION" ]; then + if [-z "BUILDPACK_PHP_VERSION" ]; then + echo " heroku config:set BUILDPACK_PHP_VERSION=$PHP_VERSION" + fi + echo " heroku config:unset PHP_VERSION" + fi + + if [ -n "$WORDPRESS_VERSION" ]; then + if [-z "BUILDPACK_WORDPRESS_VERSION" ]; then + echo " heroku config:set BUILDPACK_WORDPRESS_VERSION=$WORDPRESS_VERSION" + fi + echo " heroku config:unset WORDPRESS_VERSION" + fi + + if [ -n "$S3_BUCKET" ]; then + if [-z "BUILDPACK_S3_BUCKET" ]; then + echo " heroku config:set BUILDPACK_S3_BUCKET=$S3_BUCKET" + fi + echo " heroku config:unset S3_BUCKET" + fi + + if [ -n "WORDPRESS_DIR" ]; then + if [-z "BUILDPACK_WORDPRESS_DIR" ]; then + echo " heroku config:set BUILDPACK_WORDPRESS_DIR=$WORDPRESS_DIR" + fi + echo " heroku config:unset WORDPRESS_DIR" + fi + exit 250 fi From c17a77f13a5e9af53ba52178f39a49998305dd7d Mon Sep 17 00:00:00 2001 From: Oskari Okko Ojala Date: Mon, 17 Mar 2014 13:22:05 +0200 Subject: [PATCH 10/16] better conversion instructions, add missing $ --- bin/compile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/compile b/bin/compile index bd5aaf33..c5e40adc 100755 --- a/bin/compile +++ b/bin/compile @@ -50,35 +50,35 @@ if [ -n "$NGINX_VERSION" ] || [ -n "$PHP_VERSION" ] || [ -n "$WORDPRESS_VERSION" echo "Rename/remove the variables and then push again:" echo "" if [ -n "$NGINX_VERSION" ]; then - if [-z "BUILDPACK_NGINX_VERSION" ]; then + if [-z "$BUILDPACK_NGINX_VERSION" ]; then echo " heroku config:set BUILDPACK_NGINX_VERSION=$NGINX_VERSION" fi echo " heroku config:unset NGINX_VERSION" fi if [ -n "$PHP_VERSION" ]; then - if [-z "BUILDPACK_PHP_VERSION" ]; then + if [-z "$BUILDPACK_PHP_VERSION" ]; then echo " heroku config:set BUILDPACK_PHP_VERSION=$PHP_VERSION" fi echo " heroku config:unset PHP_VERSION" fi if [ -n "$WORDPRESS_VERSION" ]; then - if [-z "BUILDPACK_WORDPRESS_VERSION" ]; then + if [-z "$BUILDPACK_WORDPRESS_VERSION" ]; then echo " heroku config:set BUILDPACK_WORDPRESS_VERSION=$WORDPRESS_VERSION" fi echo " heroku config:unset WORDPRESS_VERSION" fi if [ -n "$S3_BUCKET" ]; then - if [-z "BUILDPACK_S3_BUCKET" ]; then + if [-z "$BUILDPACK_S3_BUCKET" ]; then echo " heroku config:set BUILDPACK_S3_BUCKET=$S3_BUCKET" fi echo " heroku config:unset S3_BUCKET" fi - if [ -n "WORDPRESS_DIR" ]; then - if [-z "BUILDPACK_WORDPRESS_DIR" ]; then + if [ -n "$WORDPRESS_DIR" ]; then + if [-z "$BUILDPACK_WORDPRESS_DIR" ]; then echo " heroku config:set BUILDPACK_WORDPRESS_DIR=$WORDPRESS_DIR" fi echo " heroku config:unset WORDPRESS_DIR" From 48936f451367cd19d7d2cb93b22075c5b6bdf47d Mon Sep 17 00:00:00 2001 From: Oskari Okko Ojala Date: Mon, 17 Mar 2014 13:23:10 +0200 Subject: [PATCH 11/16] better conversion instructions, add missing spaces --- bin/compile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/compile b/bin/compile index c5e40adc..60411914 100755 --- a/bin/compile +++ b/bin/compile @@ -50,35 +50,35 @@ if [ -n "$NGINX_VERSION" ] || [ -n "$PHP_VERSION" ] || [ -n "$WORDPRESS_VERSION" echo "Rename/remove the variables and then push again:" echo "" if [ -n "$NGINX_VERSION" ]; then - if [-z "$BUILDPACK_NGINX_VERSION" ]; then + if [ -z "$BUILDPACK_NGINX_VERSION" ]; then echo " heroku config:set BUILDPACK_NGINX_VERSION=$NGINX_VERSION" fi echo " heroku config:unset NGINX_VERSION" fi if [ -n "$PHP_VERSION" ]; then - if [-z "$BUILDPACK_PHP_VERSION" ]; then + if [ -z "$BUILDPACK_PHP_VERSION" ]; then echo " heroku config:set BUILDPACK_PHP_VERSION=$PHP_VERSION" fi echo " heroku config:unset PHP_VERSION" fi if [ -n "$WORDPRESS_VERSION" ]; then - if [-z "$BUILDPACK_WORDPRESS_VERSION" ]; then + if [ -z "$BUILDPACK_WORDPRESS_VERSION" ]; then echo " heroku config:set BUILDPACK_WORDPRESS_VERSION=$WORDPRESS_VERSION" fi echo " heroku config:unset WORDPRESS_VERSION" fi if [ -n "$S3_BUCKET" ]; then - if [-z "$BUILDPACK_S3_BUCKET" ]; then + if [ -z "$BUILDPACK_S3_BUCKET" ]; then echo " heroku config:set BUILDPACK_S3_BUCKET=$S3_BUCKET" fi echo " heroku config:unset S3_BUCKET" fi if [ -n "$WORDPRESS_DIR" ]; then - if [-z "$BUILDPACK_WORDPRESS_DIR" ]; then + if [ -z "$BUILDPACK_WORDPRESS_DIR" ]; then echo " heroku config:set BUILDPACK_WORDPRESS_DIR=$WORDPRESS_DIR" fi echo " heroku config:unset WORDPRESS_DIR" From c9b1de2f45a013be395b3ad780787bb9991bacf0 Mon Sep 17 00:00:00 2001 From: Oskari Okko Ojala Date: Mon, 17 Mar 2014 13:28:41 +0200 Subject: [PATCH 12/16] relocate warnings to proper place in compile Conflicts: bin/compile --- bin/compile | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/bin/compile b/bin/compile index 60411914..c2a3170f 100755 --- a/bin/compile +++ b/bin/compile @@ -18,29 +18,6 @@ export_env_dir $3 # START CONFIG -# Support end-user configured BUILDPACK_NGINX_VERSION, BUILDPACK_PHP_VERSION, BUILDPACK_WORDPRESS_VERSION, -# BUILDPACK_S3_BUCKET, BUILDPACK_WORDPRESS_DIR environment variables. This way, end-users -# can choose exactly which versions to run with. Requires user-env-compile for now, -# but will continue to work when Heroku deprecates user-env-compile and ENV_DIR -# appears to this script as a parameter. - -if [ -z "$BUILDPACK_NGINX_VERSION" ]; then - BUILDPACK_NGINX_VERSION=1.4.2 -fi - -if [ -z "$BUILDPACK_PHP_VERSION" ]; then - BUILDPACK_PHP_VERSION=5.5.2 -fi - -if [ -z "$BUILDPACK_WORDPRESS_VERSION" ]; then - BUILDPACK_WORDPRESS_VERSION=3.9.1 -fi - -if [ -z "$BUILDPACK_S3_BUCKET" ]; then - BUILDPACK_S3_BUCKET=heroku-buildpack-wordpress -fi - - # Prevent publishing if old environment variables set. This feature will be removed in the future # and thus the "global names" used before will be for application use. if [ -n "$NGINX_VERSION" ] || [ -n "$PHP_VERSION" ] || [ -n "$WORDPRESS_VERSION" ] || [ -n "$S3_BUCKET" ] || [ -n "$WORDPRESS_DIR" ]; then @@ -87,6 +64,28 @@ if [ -n "$NGINX_VERSION" ] || [ -n "$PHP_VERSION" ] || [ -n "$WORDPRESS_VERSION" exit 250 fi +# Support end-user configured BUILDPACK_NGINX_VERSION, BUILDPACK_PHP_VERSION, BUILDPACK_WORDPRESS_VERSION, +# BUILDPACK_S3_BUCKET, BUILDPACK_WORDPRESS_DIR environment variables. This way, end-users +# can choose exactly which versions to run with. Requires user-env-compile for now, +# but will continue to work when Heroku deprecates user-env-compile and ENV_DIR +# appears to this script as a parameter. + +if [ -z "$BUILDPACK_NGINX_VERSION" ]; then + BUILDPACK_NGINX_VERSION=1.4.2 +fi + +if [ -z "$BUILDPACK_PHP_VERSION" ]; then + BUILDPACK_PHP_VERSION=5.5.2 +fi + +if [ -z "$BUILDPACK_WORDPRESS_VERSION" ]; then + BUILDPACK_WORDPRESS_VERSION=3.9.1 +fi + +if [ -z "$BUILDPACK_S3_BUCKET" ]; then + BUILDPACK_S3_BUCKET=heroku-buildpack-wordpress +fi + # END CONFIG # From 97161c7bd4a08660903455f174a5511be6d94407 Mon Sep 17 00:00:00 2001 From: Oskari Okko Ojala Date: Mon, 17 Mar 2014 13:40:22 +0200 Subject: [PATCH 13/16] shorter message --- bin/compile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/compile b/bin/compile index c2a3170f..41187bc1 100755 --- a/bin/compile +++ b/bin/compile @@ -22,9 +22,8 @@ export_env_dir $3 # and thus the "global names" used before will be for application use. if [ -n "$NGINX_VERSION" ] || [ -n "$PHP_VERSION" ] || [ -n "$WORDPRESS_VERSION" ] || [ -n "$S3_BUCKET" ] || [ -n "$WORDPRESS_DIR" ]; then echo "Aborting. Env variables controlling buildpack should be prefixed with \"BUILDPACK_\"." - echo "This applies to variables NGINX_VERSION, PHP_VERSION, WORDPRESS_VERSION, S3_BUCKET, WORDPRESS_DIR." echo "" - echo "Rename/remove the variables and then push again:" + echo "Change the heroku config and then push again:" echo "" if [ -n "$NGINX_VERSION" ]; then if [ -z "$BUILDPACK_NGINX_VERSION" ]; then From 0005131b465ad0826722cfc1add2228fbef6d9a5 Mon Sep 17 00:00:00 2001 From: Oskari Okko Ojala Date: Wed, 9 Apr 2014 17:54:55 +0300 Subject: [PATCH 14/16] debugging heroku style --- bin/compile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/compile b/bin/compile index 41187bc1..816bef84 100755 --- a/bin/compile +++ b/bin/compile @@ -127,12 +127,12 @@ curl --silent --max-time 60 --location $WORDPRESS_URL | tar xz # Support installation of WordPress into a subdirectory instead of the docroot if [ -n "$BUILDPACK_WORDPRESS_DIR" ]; then - echo "-----> BUILDPACK_WORDPRESS_DIR is set to ${BUILDPACK_WORDPRESS_DIR}" + echo " BUILDPACK_WORDPRESS_DIR is set to ${BUILDPACK_WORDPRESS_DIR}" mkdir "public" mv wordpress "public/$BUILDPACK_WORDPRESS_DIR" WORDPRESS_INSTALLATION_DIR="public/$BUILDPACK_WORDPRESS_DIR" else - echo "-----> BUILDPACK_WORDPRESS_DIR not set. Installing WordPress to /" + echo " BUILDPACK_WORDPRESS_DIR not set. Installing WordPress to /" mv wordpress public WORDPRESS_INSTALLATION_DIR="public" fi From bdb59bafd4c4f886b0c9d3a0c4d656a2a038be39 Mon Sep 17 00:00:00 2001 From: Oskari Okko Ojala Date: Tue, 17 Jun 2014 11:17:03 +0300 Subject: [PATCH 15/16] Wordpress to WordPress --- bin/compile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index 816bef84..de5110e0 100755 --- a/bin/compile +++ b/bin/compile @@ -121,7 +121,7 @@ if [ ! -d ./vendor/php ]; then fi # WordPress -echo "-----> Installing Wordpress v${BUILDPACK_WORDPRESS_VERSION}" +echo "-----> Installing WordPress v${BUILDPACK_WORDPRESS_VERSION}" cd ${BUILD_DIR} curl --silent --max-time 60 --location $WORDPRESS_URL | tar xz From 02ea0facfdb0bfa809f1a14945c688637266b173 Mon Sep 17 00:00:00 2001 From: Oskari Okko Ojala Date: Thu, 7 Aug 2014 12:09:33 +0300 Subject: [PATCH 16/16] Default to WP 3.9.2 --- VERSIONS.md | 1 + bin/compile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/VERSIONS.md b/VERSIONS.md index 55525618..028cf9cf 100644 --- a/VERSIONS.md +++ b/VERSIONS.md @@ -14,6 +14,7 @@ PHP * 5.3.9 (5.3-stable) WordPress *downloaded directly* from [WordPress](http://wordpress.org/download/release-archive/) +* 3.9.2 * 3.9.1 * 3.9 * 3.8.2 diff --git a/bin/compile b/bin/compile index de5110e0..9f3b39f0 100755 --- a/bin/compile +++ b/bin/compile @@ -78,7 +78,7 @@ if [ -z "$BUILDPACK_PHP_VERSION" ]; then fi if [ -z "$BUILDPACK_WORDPRESS_VERSION" ]; then - BUILDPACK_WORDPRESS_VERSION=3.9.1 + BUILDPACK_WORDPRESS_VERSION=3.9.2 fi if [ -z "$BUILDPACK_S3_BUCKET" ]; then