diff --git a/README.md b/README.md index 3d6499a..400138c 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview Mastodon is a free, open-source microblogging social network. It is a decentralized alternative to commercial platforms like Twitter and avoids the risks of a single company monopolizing your communication for commercial purposes. -**Shipped version:** 3.2.1 (3.1.2 on Jessie) +**Shipped version:** 3.2.1 ## Important points to read before installing diff --git a/README_fr.md b/README_fr.md index 3627959..548c3e6 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble Mastodon est un réseau social de microblog auto-hébergé et open source. C'est une alternative décentralisée aux plates-formes commerciales comme Twitter. Mastodon évite ainsi les risques qu'une seule société monopolise votre communication à des fins commerciales. -**Version incluse:** 3.2.1 (3.1.2 on Jessie) +**Version incluse:** 3.2.1 ## Points importants à lire avant l'installation diff --git a/conf/jessie.src b/conf/jessie.src deleted file mode 100644 index fc275ee..0000000 --- a/conf/jessie.src +++ /dev/null @@ -1,6 +0,0 @@ -SOURCE_URL=https://github.com/tootsuite/mastodon/archive/v3.1.2.tar.gz -SOURCE_SUM=c12fd8c1b426861825d37d2eab1d6356be05b2b321eae0c1b87f80fcc11b0da7 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= diff --git a/manifest.json b/manifest.json index f590076..84dbe56 100644 --- a/manifest.json +++ b/manifest.json @@ -23,7 +23,7 @@ } ], "requirements": { - "yunohost": ">= 3.8.2" + "yunohost": ">= 4.0" }, "multi_instance": true, "services": [ 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"