From 29e67a6cbba89144898fc90ba967d3ce3577efbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
Date: Tue, 12 Dec 2023 09:22:49 +0100
Subject: [PATCH] Put in _common.sh the setup_source trick

---
 scripts/_common.sh | 12 ++++++++++++
 scripts/install    | 12 ++++--------
 scripts/upgrade    | 25 +++++++++----------------
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 944a65e..b2ada97 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -8,6 +8,18 @@
 # PERSONAL HELPERS
 #=================================================
 
+_dotclear2_setup_source() {
+    # In case of a new version, the url change from http://download.dotclear.org/latest/dotclear-X.X.X.tar.gz to http://download.dotclear.org/attic/dotclear-X.X.X.tar.gz
+
+    src_url=$(cat $YNH_APP_BASEDIR/manifest.toml | toml_to_json | jq '.resources.sources.latest.url' -r)
+
+    if curl --output /dev/null --silent --head --fail "$src_url"; then
+        ynh_setup_source --dest_dir="$install_dir" --source_id="latest"
+    else
+        ynh_setup_source --dest_dir="$install_dir" --source_id="attic"
+    fi
+}
+
 #=================================================
 # EXPERIMENTAL HELPERS
 #=================================================
diff --git a/scripts/install b/scripts/install
index e4f1116..19755e4 100755
--- a/scripts/install
+++ b/scripts/install
@@ -14,13 +14,7 @@ source /usr/share/yunohost/helpers
 #=================================================
 ynh_script_progression --message="Setting up source files..." --weight=4
 
-# In case of a new version, the url change from http://download.dotclear.org/latest/dotclear-X.X.X.tar.gz to http://download.dotclear.org/attic/dotclear-X.X.X.tar.gz
-src_url=$(cat $YNH_APP_BASEDIR/manifest.toml | toml_to_json | jq '.resources.sources.latest.url' -r)
-if ! curl --output /dev/null --silent --head --fail "$src_url"; then
-	ynh_setup_source --dest_dir="$install_dir" --source_id="attic"
-else
-	ynh_setup_source --dest_dir="$install_dir" --source_id="latest"
-fi
+_dotclear2_setup_source
 
 chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
@@ -134,7 +128,9 @@ ynh_local_curl $installUrl "u_email=$email" "u_firstname=$firstname" "u_name=$la
 ynh_script_progression --message="Configuring Fail2Ban..."
 
 # Create a dedicated Fail2Ban config
-ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failregex="Invalid credentials in $install_dir/inc/class.auth.ldap.php .* client: <HOST>, .*https://$domain${path%/}/admin/auth.php"
+ynh_add_fail2ban_config \
+	--logpath="/var/log/nginx/${domain}-error.log" \
+	--failregex="Invalid credentials in $install_dir/inc/class.auth.ldap.php .* client: <HOST>, .*https://$domain${path%/}/admin/auth.php"
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/upgrade b/scripts/upgrade
index da82346..74f06d6 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -23,14 +23,14 @@ upgrade_type=$(ynh_check_app_version_changed)
 ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
 
 if [ -z "${blog_admin:-}" ] ||
- [ -z "$blog_contentadmin" ] || 
- [ -z "$blog_usage" ] || 
- [ -z "$blog_publish" ] || 
- [ -z "$blog_delete" ] || 
- [ -z "$blog_categories" ] || 
- [ -z "$blog_media_admin" ] || 
- [ -z "$blog_media" ] || 
- [ -z "$blog_pages" ] || 
+ [ -z "$blog_contentadmin" ] ||
+ [ -z "$blog_usage" ] ||
+ [ -z "$blog_publish" ] ||
+ [ -z "$blog_delete" ] ||
+ [ -z "$blog_categories" ] ||
+ [ -z "$blog_media_admin" ] ||
+ [ -z "$blog_media" ] ||
+ [ -z "$blog_pages" ] ||
  [ -z "$blog_blogroll" ]; then
 	blog_admin="false"
 	blog_contentadmin="false"
@@ -62,14 +62,7 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
 	ynh_script_progression --message="Upgrading source files..."
 
-	# Download, check integrity, uncompress and patch the source from app.src
-	# In case of a new version, the url change from http://download.dotclear.org/latest/dotclear-X.X.X.tar.gz to http://download.dotclear.org/attic/dotclear-X.X.X.tar.gz
-	src_url=$(cat $YNH_APP_BASEDIR/manifest.toml | toml_to_json | jq '.resources.sources.latest.url' -r)
-	if ! curl --output /dev/null --silent --head --fail "$src_url"; then
-	        ynh_setup_source --dest_dir="$install_dir" --source_id="attic"
-	else
-	        ynh_setup_source --dest_dir="$install_dir" --source_id="latest"
-	fi
+	_dotclear2_setup_source
 fi
 
 chmod -R o-rwx "$install_dir"