Skip to content

Commit c9b1de2

Browse files
committed
relocate warnings to proper place in compile
Conflicts: bin/compile
1 parent 48936f4 commit c9b1de2

File tree

1 file changed

+22
-23
lines changed

1 file changed

+22
-23
lines changed

bin/compile

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,29 +18,6 @@ export_env_dir $3
1818

1919
# START CONFIG
2020

21-
# Support end-user configured BUILDPACK_NGINX_VERSION, BUILDPACK_PHP_VERSION, BUILDPACK_WORDPRESS_VERSION,
22-
# BUILDPACK_S3_BUCKET, BUILDPACK_WORDPRESS_DIR environment variables. This way, end-users
23-
# can choose exactly which versions to run with. Requires user-env-compile for now,
24-
# but will continue to work when Heroku deprecates user-env-compile and ENV_DIR
25-
# appears to this script as a parameter.
26-
27-
if [ -z "$BUILDPACK_NGINX_VERSION" ]; then
28-
BUILDPACK_NGINX_VERSION=1.4.2
29-
fi
30-
31-
if [ -z "$BUILDPACK_PHP_VERSION" ]; then
32-
BUILDPACK_PHP_VERSION=5.5.2
33-
fi
34-
35-
if [ -z "$BUILDPACK_WORDPRESS_VERSION" ]; then
36-
BUILDPACK_WORDPRESS_VERSION=3.9.1
37-
fi
38-
39-
if [ -z "$BUILDPACK_S3_BUCKET" ]; then
40-
BUILDPACK_S3_BUCKET=heroku-buildpack-wordpress
41-
fi
42-
43-
4421
# Prevent publishing if old environment variables set. This feature will be removed in the future
4522
# and thus the "global names" used before will be for application use.
4623
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"
8764
exit 250
8865
fi
8966

67+
# Support end-user configured BUILDPACK_NGINX_VERSION, BUILDPACK_PHP_VERSION, BUILDPACK_WORDPRESS_VERSION,
68+
# BUILDPACK_S3_BUCKET, BUILDPACK_WORDPRESS_DIR environment variables. This way, end-users
69+
# can choose exactly which versions to run with. Requires user-env-compile for now,
70+
# but will continue to work when Heroku deprecates user-env-compile and ENV_DIR
71+
# appears to this script as a parameter.
72+
73+
if [ -z "$BUILDPACK_NGINX_VERSION" ]; then
74+
BUILDPACK_NGINX_VERSION=1.4.2
75+
fi
76+
77+
if [ -z "$BUILDPACK_PHP_VERSION" ]; then
78+
BUILDPACK_PHP_VERSION=5.5.2
79+
fi
80+
81+
if [ -z "$BUILDPACK_WORDPRESS_VERSION" ]; then
82+
BUILDPACK_WORDPRESS_VERSION=3.9.1
83+
fi
84+
85+
if [ -z "$BUILDPACK_S3_BUCKET" ]; then
86+
BUILDPACK_S3_BUCKET=heroku-buildpack-wordpress
87+
fi
88+
9089
# END CONFIG
9190

9291
#

0 commit comments

Comments
 (0)