From aa754b2fb62a6fd5254e07efbca67263ceb7dcf7 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 8 Sep 2022 21:15:19 +0200 Subject: Update updater.sh --- .github/workflows/updater.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 2c00a9d..1499a0f 100644 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -24,24 +24,25 @@ assets="https://github.com/tootsuite/mastodon/archive/refs/tags/$version.tar.gz" # Sometimes the release name starts with a "v", so let's filter it out. # You may need more tweaks here if the upstream repository has different naming conventions. if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then - version=${version:1} + version=${version:1} fi # Setting up the environment variables echo "Current version: $current_version" echo "Latest release from upstream: $version" echo "VERSION=$version" >> $GITHUB_ENV +echo "REPO=$repo" >> $GITHUB_ENV # For the time being, let's assume the script will fail echo "PROCEED=false" >> $GITHUB_ENV # Proceed only if the retrieved version is greater than the current one if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then - echo "::warning ::No new version available" - exit 0 + echo "::warning ::No new version available" + exit 0 # Proceed only if a PR for this new version does not already exist elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then - echo "::warning ::A branch already exists for this update" - exit 0 + echo "::warning ::A branch already exists for this update" + exit 0 fi #================================================= @@ -81,6 +82,7 @@ SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=$extension SOURCE_IN_SUBDIR=true SOURCE_FILENAME= +SOURCE_EXTRACT=true EOT echo "... conf/$src.src updated" -- cgit v1.2.3-70-g09d2 From be81679fa10a17166b69e88f643a1b955516df6c Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 8 Sep 2022 21:15:27 +0200 Subject: Update restore --- scripts/restore | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/restore b/scripts/restore index c71b839..92708c3 100644 --- a/scripts/restore +++ b/scripts/restore @@ -45,13 +45,6 @@ test ! -d $final_path \ #================================================= # STANDARD RESTORATION STEPS -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - #================================================= # RECREATE THE DEDICATED USER #================================================= @@ -84,6 +77,13 @@ ynh_exec_warn_less ynh_install_ruby --ruby_version=$ruby_version ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version ynh_exec_warn_less ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" +#================================================= +# RESTORE THE NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Restoring the NGINX web server configuration..." + +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" + #================================================= # RESTORE THE POSTGRESQL DATABASE #================================================= -- cgit v1.2.3-70-g09d2 From 143464a3a926776ad65cc65de0cffa13a5376f52 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 8 Sep 2022 19:15:33 +0000 Subject: Auto-update README --- README.md | 1 + README_fr.md | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5c262aa..429840b 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,7 @@ Mastodon is a free, open-source microblogging social network. It is a decentrali **Shipped version:** 3.5.3~ynh3 + **Demo:** https://joinmastodon.org/ ## Screenshots diff --git a/README_fr.md b/README_fr.md index f54a37c..1a86f38 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,8 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour 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.5.3~ynh3 +**Version incluse :** 3.5.3~ynh3 + **Démo :** https://joinmastodon.org/ -- cgit v1.2.3-70-g09d2 From 4cbbfa233899cde7402229cb63eaf7b80714b8d2 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 20 Sep 2022 01:25:40 +0200 Subject: Update app.src --- conf/app.src | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/app.src b/conf/app.src index 9d400b8..b957ecb 100644 --- a/conf/app.src +++ b/conf/app.src @@ -4,3 +4,4 @@ SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true SOURCE_FILENAME= +SOURCE_EXTRACT=true -- cgit v1.2.3-70-g09d2