diff options
| author | yalh76 <yalh@yahoo.com> | 2020-10-31 21:43:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-31 21:43:23 +0100 |
| commit | cd9e7f85858433c9729454fa8d3ab9f821209a08 (patch) | |
| tree | ed3143ea2046bb260cad7ac27a12fa47c7ac8613 /scripts | |
| parent | bde14cc4496445fdfed4616ac44fc9527c8369fd (diff) | |
| parent | 8a505d8c85cf812c48595b2a6ff47c9a90866fa5 (diff) | |
| download | mastodon_ynh-cd9e7f85858433c9729454fa8d3ab9f821209a08.tar.gz mastodon_ynh-cd9e7f85858433c9729454fa8d3ab9f821209a08.tar.bz2 mastodon_ynh-cd9e7f85858433c9729454fa8d3ab9f821209a08.zip | |
Merge pull request #239 from YunoHost-Apps/testing
Upgrade 3.2.1
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/install | 13 | ||||
| -rw-r--r-- | scripts/upgrade | 12 |
2 files changed, 3 insertions, 22 deletions
diff --git a/scripts/install b/scripts/install index 0c92114..01a2efc 100644 --- a/scripts/install +++ b/scripts/install @@ -102,18 +102,7 @@ ynh_script_progression --message="Setting up source files..." ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src -mkdir $final_path - -if [ "$(lsb_release --codename --short)" = "buster" ]; then - ynh_setup_source --dest_dir="$final_path/live" -else - ynh_script_progression --message="Setting up source files..." - - ynh_setup_source --dest_dir="$final_path/live" --source_id=jessie - - # 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" -fi +ynh_setup_source --dest_dir="$final_path/live" #================================================= # NGINX CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index f10087a..2914550 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -183,16 +183,8 @@ then fi rsync -a "$config" "$tmpdir/." ynh_secure_remove --file="$final_path/live" - if [ "$(lsb_release --codename --short)" = "buster" ]; then - ynh_setup_source --dest_dir="$final_path/live" - else - ynh_script_progression --message="Setting up source files..." - - ynh_setup_source --dest_dir="$final_path/live" --source_id=jessie - - # 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" - fi + + ynh_setup_source --dest_dir="$final_path/live" if [ -d "$final_path/system.tmp" ]; then mv --verbose --no-target-directory "$final_path/system.tmp" "$final_path/live/public/system" |