spaces in file names are not the enemy

adamturtle · Aug 20, 2014 · 7247160 · 7247160
1 parent fff2cbb
commit 7247160
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 32 deletions.
diff --git a/bin/heroku-hhvm-apache2 b/bin/heroku-hhvm-apache2
@@ -8,16 +8,16 @@ set -eu
 shopt -s extglob
 
 php_passthrough() {
-    local dir=$(dirname $1)
-    local file=$(basename $1)
-    local out=$(basename $file .php)
+    local dir=$(dirname "$1")
+    local file=$(basename "$1")
+    local out=$(basename "$file" .php)
     if [[ "$out" != "$file" ]]; then
         echo "Interpreting ${1#$HEROKU_APP_DIR/} to $out" >&2
         out="$dir/$out"
-        hhvm $1 > $out
-        echo $out
+        hhvm "$1" > "$out"
+        echo "$out"
     else
-        echo $1
+        echo "$1"
     fi
 }
 

diff --git a/bin/heroku-hhvm-nginx b/bin/heroku-hhvm-nginx
@@ -8,16 +8,16 @@ set -eu
 shopt -s extglob
 
 php_passthrough() {
-    local dir=$(dirname $1)
-    local file=$(basename $1)
-    local out=$(basename $file .php)
+    local dir=$(dirname "$1")
+    local file=$(basename "$1")
+    local out=$(basename "$file" .php)
     if [[ "$out" != "$file" ]]; then
         echo "Interpreting ${1#$HEROKU_APP_DIR/} to $out" >&2
         out="$dir/$out"
-        hhvm $1 > $out
-        echo $out
+        hhvm "$1" > "$out"
+        echo "$out"
     else
-        echo $1
+        echo "$1"
     fi
 }
 

diff --git a/bin/heroku-php-apache2 b/bin/heroku-php-apache2
@@ -8,16 +8,16 @@ set -eu
 shopt -s extglob
 
 php_passthrough() {
-    local dir=$(dirname $1)
-    local file=$(basename $1)
-    local out=$(basename $file .php)
+    local dir=$(dirname "$1")
+    local file=$(basename "$1")
+    local out=$(basename "$file" .php)
     if [[ "$out" != "$file" ]]; then
         echo "Interpreting ${1#$HEROKU_APP_DIR/} to $out" >&2
         out="$dir/$out"
-        php $1 > $out
-        echo $out
+        php "$1" > "$out"
+        echo "$out"
     else
-        echo $1
+        echo "$1"
     fi
 }
 

diff --git a/bin/heroku-php-nginx b/bin/heroku-php-nginx
@@ -8,16 +8,16 @@ set -eu
 shopt -s extglob
 
 php_passthrough() {
-    local dir=$(dirname $1)
-    local file=$(basename $1)
-    local out=$(basename $file .php)
+    local dir=$(dirname "$1")
+    local file=$(basename "$1")
+    local out=$(basename "$file" .php)
     if [[ "$out" != "$file" ]]; then
         echo "Interpreting ${1#$HEROKU_APP_DIR/} to $out" >&2
         out="$dir/$out"
-        php $1 > $out
-        echo $out
+        php "$1" > "$out"
+        echo "$out"
     else
-        echo $1
+        echo "$1"
     fi
 }
 

diff --git a/conf/apache2/heroku.conf b/conf/apache2/heroku.conf
@@ -22,7 +22,7 @@ Listen ${PORT}
 
     TraceEnable off
 
-    <Directory ${HEROKU_APP_DIR}>
+    <Directory "${HEROKU_APP_DIR}">
         # lock it down fully by default
         # if it's also the docroot, it'll be opened up again further below
         Require all denied
@@ -32,16 +32,16 @@ Listen ${PORT}
         </FilesMatch>
     </Directory>
     # handle these separately; who knows where they are and whether they're accessible
-    <Directory ${HEROKU_APP_DIR}/${COMPOSER_VENDOR_DIR}>
+    <Directory "${HEROKU_APP_DIR}/${COMPOSER_VENDOR_DIR}">
         Require all denied
     </Directory>
-    <Directory ${HEROKU_APP_DIR}/${COMPOSER_BIN_DIR}>
+    <Directory "${HEROKU_APP_DIR}/${COMPOSER_BIN_DIR}">
         Require all denied
     </Directory>
 
-    DocumentRoot ${DOCUMENT_ROOT}
+    DocumentRoot "${DOCUMENT_ROOT}"
 
-    <Directory ${DOCUMENT_ROOT}>
+    <Directory "${DOCUMENT_ROOT}">
         Options FollowSymLinks
 
         # allow .htaccess to do everything
@@ -60,6 +60,6 @@ Listen ${PORT}
         SetHandler proxy:fcgi://heroku-fcgi
     </FilesMatch>
 
-    Include ${HEROKU_PHP_HTTPD_CONFIG_INCLUDE}
+    Include "${HEROKU_PHP_HTTPD_CONFIG_INCLUDE}"
 
 </VirtualHost>
diff --git a/conf/nginx/heroku.conf.php b/conf/nginx/heroku.conf.php
@@ -32,12 +32,12 @@
         # FIXME: breaks redirects with foreman
         port_in_redirect off;
 
-        root <?=getenv('DOCUMENT_ROOT')?:getenv('HEROKU_APP_DIR')?:getcwd()?>;
+        root "<?=getenv('DOCUMENT_ROOT')?:getenv('HEROKU_APP_DIR')?:getcwd()?>";
 
         error_log stderr;
         access_log /tmp/heroku.nginx_access.<?=getenv('PORT')?:'8080'?>.log;
 
-        include <?=getenv('HEROKU_PHP_NGINX_CONFIG_INCLUDE')?>;
+        include "<?=getenv('HEROKU_PHP_NGINX_CONFIG_INCLUDE')?>";
 
         # restrict access to hidden files, just in case
         location ~ /\. {