aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryalh76 <yalh@yahoo.com>2022-04-25 23:08:00 +0200
committerGitHub <noreply@github.com>2022-04-25 23:08:00 +0200
commiteeb0c2fc6cb4a07cd07bc964ec94d9d76d2d2ee2 (patch)
treea6310d43a4eba1c82f332f04e4068326427ddc6b
parente63e4d8b18bd4fec8ab359a9e9c38d5c8563e69d (diff)
parent8ab14654a682bf5d95277ac8123a8eca615fb2bf (diff)
downloadmastodon_ynh-eeb0c2fc6cb4a07cd07bc964ec94d9d76d2d2ee2.tar.gz
mastodon_ynh-eeb0c2fc6cb4a07cd07bc964ec94d9d76d2d2ee2.tar.bz2
mastodon_ynh-eeb0c2fc6cb4a07cd07bc964ec94d9d76d2d2ee2.zip
Merge pull request #321 from YunoHost-Apps/fix-nokogiri
Fix Nokogiri dep install
-rw-r--r--scripts/install1
-rw-r--r--scripts/upgrade1
2 files changed, 2 insertions, 0 deletions
diff --git a/scripts/install b/scripts/install
index 696d59e..bb99a57 100644
--- a/scripts/install
+++ b/scripts/install
@@ -206,6 +206,7 @@ ynh_script_progression --message="Installing Mastodon..."
pushd "$final_path/live"
ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config deployment 'true'
ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config without 'development test'
+ ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config set force_ruby_platform true
ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle install -j$(getconf _NPROCESSORS_ONLN)
ynh_use_nodejs
ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH yarn install --pure-lockfile
diff --git a/scripts/upgrade b/scripts/upgrade
index 1c24a62..3b8290c 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -272,6 +272,7 @@ ynh_script_progression --message="Upgrading Mastodon..."
pushd "$final_path/live"
ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config deployment 'true'
ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config without 'development test'
+ ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config set force_ruby_platform true --quiet
ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle install -j$(getconf _NPROCESSORS_ONLN)
ynh_use_nodejs
ynh_exec_as $app $ynh_node_load_PATH yarn install --pure-lockfile