From ba3ce5d001e05f6ad530b85ee24279c326705775 Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Tue, 12 Jun 2018 15:33:34 +0200
Subject: Fix migrated stretch upgrade (#88)

* upgrade-2.3.3

upgrade-2.3.3
git fetch with all tags forced

* Upgrade 2.4.0 (#21)

* Upgrade 2.4 (#79)

* Upgrade rb to 2.5.1

* Update upgrade

* Fix 2.3.3

* Add trace on assets:precompile

* Yarn install and precompile

Update 2.4 need root to yarn install and precompile,
Temporary bad fix.

* Update upgrade

* Fix migrate

* Update README.md

* Update manifest.json

* Upgrade yarn to 1.7.0

* Restart postgresql on upgrade

* Ready to Debian Stretch (#22)

* Ready to Debian Stretch

* rb 2.5.1 on install

* Yarn install on root

* rails precompile fix

* Fix backup on stretch

* clean

* fix backup stretch

* Change systemd mastodon service restart

* Change systemd script for stretch

* Ready to mastodon 2.4.1

* Fix migrated stretch (#23)

* Force bundle re-install

* Add check debian on upgrade and clean check
---
 scripts/upgrade | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'scripts/upgrade')

diff --git a/scripts/upgrade b/scripts/upgrade
index ca0df71..63c3b75 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -83,7 +83,11 @@ sudo ln -s $final_path/.rbenv/versions/2.5.1/bin/ruby /usr/bin/ruby || true
 sudo su - $app <<MCOMMANDS
 pushd ~/live
 $final_path/.rbenv/versions/2.5.1/bin/gem install bundler
-$final_path/.rbenv/versions/2.5.1/bin/bundle install --deployment --without development test
+if [ "$(lsb_release --codename --short)" == "jessie" ]; then
+  $final_path/.rbenv/versions/2.5.1/bin/bundle install --deployment --without development test
+else
+  $final_path/.rbenv/versions/2.5.1/bin/bundle install --deployment --force --without development test
+fi
 MCOMMANDS
 
 # Install package with yarn and restart postgresql
-- 
cgit v1.2.3-70-g09d2