fix some instances of composer's version warning messing up return va…

…lues
adamturtle · May 1, 2014 · b25bfc4 · b25bfc4
1 parent c5dbb2f
commit b25bfc4
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/bin/compile b/bin/compile
@@ -300,7 +300,7 @@ fi
 EOF
 
 if [[ ! -f "Procfile" ]]; then
-    bindir=$(composer config bin-dir)
+    bindir=$(composer config bin-dir | tail -n 1) # tail, as composer echos outdated version warnings to STDOUT
     echo "web: $bindir/heroku-$engine-apache2" > Procfile
     notice_inline "No Procfile, defaulting to 'web: $bindir/heroku-$engine-apache2'"
 fi
diff --git a/bin/heroku-hhvm-apache2 b/bin/heroku-hhvm-apache2
@@ -72,7 +72,7 @@ export HEROKU_APP_DIR=$(pwd)
 export DOCUMENT_ROOT="$HEROKU_APP_DIR"
 # set a default port if none is given
 export PORT=${PORT:-$(( $RANDOM+1024 ))}
-COMPOSER_VENDOR_DIR=$(composer config vendor-dir)
+COMPOSER_VENDOR_DIR=$(composer config vendor-dir | tail -n 1) # tail, as composer echos outdated version warnings to STDOUT
 
 while getopts ":C:c:i:h" opt; do
     case $opt in

diff --git a/bin/heroku-hhvm-nginx b/bin/heroku-hhvm-nginx
@@ -73,7 +73,7 @@ export HEROKU_APP_DIR=$(pwd)
 export DOCUMENT_ROOT="$HEROKU_APP_DIR"
 # set a default port if none is given
 export PORT=${PORT:-$(( $RANDOM+1024 ))}
-COMPOSER_VENDOR_DIR=$(composer config vendor-dir)
+COMPOSER_VENDOR_DIR=$(composer config vendor-dir | tail -n 1) # tail, as composer echos outdated version warnings to STDOUT
 
 while getopts ":C:c:i:h" opt; do
     case $opt in

diff --git a/bin/heroku-php-apache2 b/bin/heroku-php-apache2
@@ -79,7 +79,7 @@ export HEROKU_APP_DIR=$(pwd)
 export DOCUMENT_ROOT="$HEROKU_APP_DIR"
 # set a default port if none is given
 export PORT=${PORT:-$(( $RANDOM+1024 ))}
-COMPOSER_VENDOR_DIR=$(composer config vendor-dir)
+COMPOSER_VENDOR_DIR=$(composer config vendor-dir | tail -n 1) # tail, as composer echos outdated version warnings to STDOUT
 
 while getopts ":C:c:F:f:i:h" opt; do
     case $opt in

diff --git a/bin/heroku-php-nginx b/bin/heroku-php-nginx
@@ -80,7 +80,7 @@ export HEROKU_APP_DIR=$(pwd)
 export DOCUMENT_ROOT="$HEROKU_APP_DIR"
 # set a default port if none is given
 export PORT=${PORT:-$(( $RANDOM+1024 ))}
-COMPOSER_VENDOR_DIR=$(composer config vendor-dir)
+COMPOSER_VENDOR_DIR=$(composer config vendor-dir | tail -n 1) # tail, as composer echos outdated version warnings to STDOUT
 
 while getopts ":C:c:F:f:i:h" opt; do
     case $opt in