diff options
| author | yalh76 <yalh@yahoo.com> | 2020-03-29 21:43:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-29 21:43:14 +0200 |
| commit | 7e1f4c2dee5f2c8374686aea62f4648cdf2722c3 (patch) | |
| tree | 75ac7cbcd8beecb5db08bac176efe049a48eeba8 /scripts | |
| parent | 60ae82f7ff2954e68d995ec41552153bf7579542 (diff) | |
| parent | bf0dea0f437c00db213c27da299a0dda65810d6a (diff) | |
| download | mastodon_ynh-7e1f4c2dee5f2c8374686aea62f4648cdf2722c3.tar.gz mastodon_ynh-7e1f4c2dee5f2c8374686aea62f4648cdf2722c3.tar.bz2 mastodon_ynh-7e1f4c2dee5f2c8374686aea62f4648cdf2722c3.zip | |
Merge pull request #206 from YunoHost-Apps/testing
Temporary workaround
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/install | 3 | ||||
| -rw-r--r-- | scripts/upgrade | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/scripts/install b/scripts/install index 989954b..7d7d4b8 100644 --- a/scripts/install +++ b/scripts/install @@ -110,6 +110,9 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path mkdir $final_path ynh_setup_source --dest_dir="$final_path/live" +# Temporary workaround for https://github.com/tootsuite/mastodon/issues/13292 +ynh_replace_string --match_string="sidekiq-unique-jobs (6.0.18)" --replace_string="sidekiq-unique-jobs (6.0.20)" --target_file="$final_path/live/Gemfile.lock" + #================================================= # NGINX CONFIGURATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 32426a2..0bc44b3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -184,6 +184,10 @@ then rsync -a "$final_path/live/.env.production" "$tmpdir/." ynh_secure_remove --file="$final_path/live/" ynh_setup_source --dest_dir="$final_path/live" + + # Temporary workaround for https://github.com/tootsuite/mastodon/issues/13292 + ynh_replace_string --match_string="sidekiq-unique-jobs (6.0.18)" --replace_string="sidekiq-unique-jobs (6.0.20)" --target_file="$final_path/live/Gemfile.lock" + if [ -d "$tmpdir/system" ]; then rsync -a "$tmpdir/system" "$final_path/live/public/." fi |