Make sure bundle is installed in arvados-api-server-upgrade.sh,

[arvados-dev.git] / jenkins / arvados-workbench-extras / arvados-workbench-upgrade.sh

diff --git a/jenkins/arvados-workbench-extras/arvados-workbench-upgrade.sh b/jenkins/arvados-workbench-extras/arvados-workbench-upgrade.sh
index 0a2bf96d41fb368ded82fce6d7eafb131ea9cbbf..e981517bfdb0b1c849a1ed3997ed81905e3c5062 100755 (executable)
--- a/jenkins/arvados-workbench-extras/arvados-workbench-upgrade.sh
+++ b/jenkins/arvados-workbench-extras/arvados-workbench-upgrade.sh
@@ -3,7 +3,7 @@
 set -e
 
 if [ -e /etc/redhat-release ]; then
-    WWW_OWNER=apache:apache
+    WWW_OWNER=nginx:nginx
 else
     # Assume we're on a Debian-based system for now.
     WWW_OWNER=www-data:www-data
@@ -29,8 +29,8 @@ RELEASE_PATH=/var/www/arvados-workbench/current
 SHARED_PATH=/var/www/arvados-workbench/shared
 CONFIG_PATH=/etc/arvados/workbench/
 
-echo "Assumption: $NGINX_SERVICE is configured to serve workbench.$HOSTNAME from /var/www/workbench.$HOSTNAME/current"
-echo "Assumption: /var/www/$HOSTNAME is symlinked to /var/www/arvados-workbench"
+echo "Assumption: $NGINX_SERVICE is configured to serve your workbench URL from "
+echo "            /var/www/arvados-workbench/current"
 echo "Assumption: configuration files are in /etc/arvados/workbench/"
 echo "Assumption: $NGINX_SERVICE and passenger run as $WWW_OWNER"
 echo
@@ -46,6 +46,15 @@ if [[ ! -e $RELEASE_PATH/tmp ]]; then mkdir -p $RELEASE_PATH/tmp; fi
 if [[ ! -e $RELEASE_PATH/log ]]; then ln -s $SHARED_PATH/log $RELEASE_PATH/log; fi
 if [[ ! -e $SHARED_PATH/log/production.log ]]; then touch $SHARED_PATH/log/production.log; fi
 
+echo "Making sure bundle is installed"
+set +e
+which bundle > /dev/null
+if [[ "$?" != "0" ]]; then
+  gem install bundle
+fi
+set -e
+echo "Done."
+
 echo "Running bundle install"
 (cd $RELEASE_PATH && RAILS_ENV=production bundle install --path $SHARED_PATH/vendor_bundle)
 echo "Done."