From 2c8861a994de2cd200feabac8daf4a59ff43bea9 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Thu, 21 Mar 2019 02:31:06 +0100
Subject: Fix install and upgrade steps

---
 scripts/upgrade | 33 ++++++++++++---------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

(limited to 'scripts/upgrade')

diff --git a/scripts/upgrade b/scripts/upgrade
index 4c016e4..38b48ce 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -110,10 +110,6 @@ rm -Rf "$final_path/live_back"
 # Clean files which are not needed anymore
 ynh_secure_remove $final_path/live/config/initializers/timeout.rb
 
-# Upgrade rbenv and ruby plugins
-ynh_setup_source "$final_path/.rbenv"                    "app-rbenv"
-ynh_setup_source "$final_path/.rbenv/plugins/ruby-build" "app-ruby-build"
-
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
@@ -139,6 +135,9 @@ ynh_package_update
 # install nodejs
 ynh_install_nodejs 8
 
+# install ruby
+ynh_install_ruby --ruby_version=2.6.0
+
 # TODO: use the same mecanism with other files
 ynh_install_app_dependencies $pkg_dependencies
 
@@ -152,12 +151,6 @@ ynh_system_user_create $app
 
 #=================================================
 # SPECIFIC UPGRADE
-#=================================================
-# INSTALLING RUBY
-#=================================================
-
-ynh_install_ruby --ruby_version=2.6.0
-
 #=================================================
 # UPGRADE MASTODON
 #=================================================
@@ -166,20 +159,18 @@ ynh_print_info "Upgrading Mastodon..."
 chown -R "$app": "$final_path"
 
 pushd "$final_path/live"
-    su mastodon <<UPGRADE
-        ynh_use_nodejs
-        env PATH=$PATH /opt/rbenv/versions/2.6.0/bin/gem update --system
-        env PATH=$PATH /opt/rbenv/versions/2.6.0/bin/gem install bundler
+    ynh_use_nodejs
+        sudo -u "$app" env PATH=$PATH /opt/rbenv/versions/2.6.0/bin/gem update --system
+        sudo -u "$app" env PATH=$PATH /opt/rbenv/versions/2.6.0/bin/gem install bundler
         if [ "$(lsb_release --codename --short)" == "jessie" ]; then
-	        env PATH=$PATH /opt/rbenv/versions/2.6.0/bin/bundle install --deployment --without development test
+	        sudo -u "$app" env PATH=$PATH /opt/rbenv/versions/2.6.0/bin/bundle install --deployment --without development test
         else
-	        env PATH=$PATH /opt/rbenv/versions/2.6.0/bin/bundle install --deployment --force --without development test
+	        sudo -u "$app" env PATH=$PATH /opt/rbenv/versions/2.6.0/bin/bundle install --deployment --force --without development test
         fi
-        env PATH=$PATH yarn install --pure-lockfile
-        env PATH=$PATH RAILS_ENV=production /opt/rbenv/versions/2.6.0/bin/bundle exec rails assets:clean
-        env PATH=$PATH RAILS_ENV=production /opt/rbenv/versions/2.6.0/bin/bundle exec rails assets:precompile
-        env PATH=$PATH RAILS_ENV=production /opt/rbenv/versions/2.6.0/bin/bundle exec rails db:migrate
-UPGRADE
+        sudo -u "$app" env PATH=$PATH yarn install --pure-lockfile
+        sudo -u "$app" env PATH=$PATH RAILS_ENV=production /opt/rbenv/versions/2.6.0/bin/bundle exec rails assets:clean
+        sudo -u "$app" env PATH=$PATH RAILS_ENV=production /opt/rbenv/versions/2.6.0/bin/bundle exec rails assets:precompile
+        sudo -u "$app" env PATH=$PATH RAILS_ENV=production /opt/rbenv/versions/2.6.0/bin/bundle exec rails db:migrate
 popd
 
 ### Verify the checksum of a file, stored by `ynh_store_file_checksum` in the install script.
-- 
cgit v1.2.3-70-g09d2