From 678c9e4aeb5310f7c73b535e7563c516972ad807 Mon Sep 17 00:00:00 2001
From: tituspijean <tituspijean@outlook.com>
Date: Tue, 15 Aug 2023 19:57:16 +0200
Subject: [PATCH] Fix sources, again

---
 manifest.toml   | 6 ++++--
 scripts/install | 2 +-
 scripts/upgrade | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 77dfcd0..0f7eb28 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -46,12 +46,14 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen
 [resources]
     [resources.sources.latest]
     prefetch = false
-    url = "https://download.dotclear.org/latest/dotclear-2.27.1.zip"
+    in_subdir = 2
+    url = "https://download.dotclear.org/latest/dotclear-2.27.1.tar.gz"
     sha256 = "15d5d139dffd5e53f7c2301e01f085edcdbed7a89d9e829864a81b7b99cba5e8"
 
     [resources.sources.attic]
     prefetch = false
-    url = "https://download.dotclear.org/attic/dotclear-2.27.1.zip"
+    in_subdir = 2
+    url = "https://download.dotclear.org/attic/dotclear-2.27.1.tar.gz"
     sha256 = "15d5d139dffd5e53f7c2301e01f085edcdbed7a89d9e829864a81b7b99cba5e8"
 
     [resources.system_user]
diff --git a/scripts/install b/scripts/install
index a83cdc8..6f33707 100755
--- a/scripts/install
+++ b/scripts/install
@@ -15,7 +15,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")
+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
diff --git a/scripts/upgrade b/scripts/upgrade
index b6717a1..e784ef0 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -65,7 +65,7 @@ then
 
 	# 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")
+	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