Merge pull request #77 from YunoHost-Apps/cleanup

Cleanup, updater.sh

.github/workflows/updater.sh

@@ -14,8 +14,8 @@
 #=================================================
 
 # Fetching information
-current_version=$(cat manifest.json | jq -j '.version|split("~")[0]')
+current_version=$(cat manifest.toml | grep "version =" | sed 's|version = "\(.*\)~ynh[0-9]*"|\1|')
-repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]')
+# repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]')
 asset=$(curl --silent "https://download.dotclear.org/latest/" | grep "dotclear-.*?.zip" -Po | head -1)
 version=${asset%.zip}
 version=${version#dotclear-}
@@ -54,7 +54,7 @@ src="app"
 tempdir="$(mktemp -d)"
 
 # Download sources and calculate checksum
-curl --silent -4 -L http://download.dotclear.org/latest/dotclear-$version.zip -o "$tempdir/$asset"
+curl --silent -4 -L http://download.dotclear.org/latest/dotclear-$version.tar.gz -o "$tempdir/$asset"
 checksum=$(sha256sum "$tempdir/$asset" | head -c 64)
 
 # Delete temporary directory
@@ -66,17 +66,10 @@ if [[ $asset == *.zip ]]; then
 fi
 
 # Rewrite source file
-cat <<EOT > conf/$src.src
+set -x
-SOURCE_URL=http://download.dotclear.org/latest/dotclear-$version.zip
+sed -i "s|/dotclear-.*.tar.gz|/dotclear-$version.tar.gz|" manifest.toml
-SOURCE_SUM=$checksum
+sed -i "s|sha256 = \".*\"|sha256 = \"$checksum\"|" manifest.toml
-SOURCE_SUM_PRG=sha256sum
+sed -i "s|version = \".*\"|version = \"$version~ynh1\"|" manifest.toml
-SOURCE_FORMAT=$extension
-SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=
-SOURCE_EXTRACT=true
-EOT
-echo "... conf/$src.src updated"
-
 #=================================================
 # SPECIFIC UPDATE STEPS
 #=================================================
@@ -88,9 +81,6 @@ echo "... conf/$src.src updated"
 # GENERIC FINALIZATION
 #=================================================
 
-# Replace new version in manifest
-echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json
-
 # No need to update the README, yunohost-bot takes care of it
 
 # The Action will proceed only if the PROCEED environment variable is set to true

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
 #=================================================

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
+_dotclear2_setup_source
-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
 
 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

scripts/upgrade

@@ -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
+	_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="attic"
-	else
-	        ynh_setup_source --dest_dir="$install_dir" --source_id="latest"
-	fi
 fi
 
 chmod -R o-rwx "$install_dir"