aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryalh76 <yalh@yahoo.com>2019-12-29 14:54:24 +0100
committerGitHub <noreply@github.com>2019-12-29 14:54:24 +0100
commit673ee696b5e7888831549c8b7becf8fabab4f80b (patch)
tree7c5cfce2b634d810aea3ecdff5d9a22de1d5d022
parent2462892ff1f1195a95245c01c4b0fba05fd75a45 (diff)
parent8cc53046fdb7ea048b0a0505aae463a9532134ef (diff)
downloadmastodon_ynh-673ee696b5e7888831549c8b7becf8fabab4f80b.tar.gz
mastodon_ynh-673ee696b5e7888831549c8b7becf8fabab4f80b.tar.bz2
mastodon_ynh-673ee696b5e7888831549c8b7becf8fabab4f80b.zip
Merge pull request #186 from YunoHost-Apps/fix_bundler
Fix bundler
-rw-r--r--check_process1
-rw-r--r--scripts/install2
-rw-r--r--scripts/restore1
-rw-r--r--scripts/upgrade2
4 files changed, 3 insertions, 3 deletions
diff --git a/check_process b/check_process
index b4eef2b..66a0890 100644
--- a/check_process
+++ b/check_process
@@ -12,7 +12,6 @@
setup_private=0
setup_public=1
upgrade=1
- upgrade=1 from_commit=2987ccf8b3aa393dbef79b874dfe5839a0ee10da
backup_restore=1
multi_instance=1
# This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version.
diff --git a/scripts/install b/scripts/install
index 2519364..8c903b5 100644
--- a/scripts/install
+++ b/scripts/install
@@ -149,7 +149,7 @@ ynh_script_progression --message="Installing Ruby..." --weight=424
ynh_install_ruby --ruby_version=2.6.5
/opt/rbenv/versions/2.6.5/bin/gem update --system
-#/opt/rbenv/versions/2.6.5/bin/gem install bundler --no-document
+/opt/rbenv/versions/2.6.5/bin/gem install bundler:1.17.3 --no-document
#=================================================
# MODIFY A CONFIG FILE
diff --git a/scripts/restore b/scripts/restore
index 5982c94..de19461 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -114,6 +114,7 @@ ynh_script_progression --message="Installing Ruby..." --weight=393
ynh_install_ruby --ruby_version=2.6.5
/opt/rbenv/versions/2.6.5/bin/gem update --system
+/opt/rbenv/versions/2.6.5/bin/gem install bundler:1.17.3 --no-document
#=================================================
# RESTORE THE POSTGRESQL DATABASE
diff --git a/scripts/upgrade b/scripts/upgrade
index edff694..9c7eaf7 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -237,7 +237,7 @@ ynh_script_progression --message="Installing Ruby..." --weight=424
ynh_install_ruby --ruby_version=2.6.5
/opt/rbenv/versions/2.6.5/bin/gem update --system
-#/opt/rbenv/versions/2.6.5/bin/gem install bundler
+/opt/rbenv/versions/2.6.5/bin/gem install bundler:1.17.3 --no-document
#=================================================
# MODIFY A CONFIG FILE