Merge branch 'release/0.6' of github.com:sebbacon/alaveteli into release/0.6

1 files changed, 10 insertions, 9 deletions

diff --git a/script/rails-post-deploy b/script/rails-post-deploy
index 575b995f9..193d0bbec 100755
--- a/script/rails-post-deploy
+++ b/script/rails-post-deploy
@@ -45,10 +45,10 @@ else
 	mkdir -p log
 fi
 # link the "downloads" directory in the cache to somewhere it can be served
-if [ ! -e $APP_DIR/public/download ]
+if [ ! -e "$APP_DIR/public/download" ]
 then
-	mkdir -p $APP_DIR/cache/zips/download
-	ln -s $APP_DIR/cache/zips/download $APP_DIR/public/
+	mkdir -p "$APP_DIR/cache/zips/download"
+	ln -s "$APP_DIR/cache/zips/download" "$APP_DIR/public/"
 fi
 
 cd log
@@ -74,19 +74,20 @@ then
     echo "ENV['RAILS_ENV'] ||= 'production'" > config/rails_env.rb
 fi
 
+bundle_install_options=""
 if [ "$OPTION_STAGING_SITE" = "0" ]
 then
-    bundle exec bundle install  --without development:test --deployment
-else
-    bundle exec bundle install
+    bundle_install_options="--without development:test --deployment"
 fi
 
+bundle install $bundle_install_options
+
 if [ -n "$OPTION_THEME_URLS" ]
 then
     for THEME in "${OPTION_THEME_URLS[@]}"
     do
-	echo "Installing $THEME..."
-	script/plugin install --force $THEME
+        echo "Installing $THEME..."
+        script/plugin install --force $THEME
     done
 fi
 
@@ -94,7 +95,7 @@ fi
 if [ -n "$OPTION_THEME_URL" ]
 then
         echo "Installing $OPTION_THEME_URL using deprecated THEME_URL..."
-	script/plugin install --force $OPTION_THEME_URL
+        script/plugin install --force $OPTION_THEME_URL
 fi
 
 # upgrade database