Fix helpers 2.1

YunoHost-Apps · Sep 2, 2024 · 003a2bf · 003a2bf
1 parent ba2715e
commit 003a2bf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/manifest.toml b/manifest.toml
@@ -42,7 +42,7 @@ ram.runtime = "50M"
 [resources]
     [resources.sources]
 
-        [resources.sources.main]
+        [resources.sources.scrutiny-web-linux]
         in_subdir = false
         rename = "scrutiny-web-linux"
         amd64.url = "https://github.com/AnalogJ/scrutiny/releases/download/v0.8.1/scrutiny-web-linux-amd64"
@@ -56,6 +56,7 @@ ram.runtime = "50M"
 
         [resources.sources.scrutiny-collector-metrics-linux]
         in_subdir = false
+        rename = "scrutiny-collector-metrics-linux"
         amd64.url = "https://github.com/AnalogJ/scrutiny/releases/download/v0.8.1/scrutiny-collector-metrics-linux-amd64"
         amd64.sha256 = "904056ddc4e0bd3455a0db45d56f98084135a967eef018d18bfc8e4c0ef6887e"
         arm64.url = "https://github.com/AnalogJ/scrutiny/releases/download/v0.8.1/scrutiny-collector-metrics-linux-arm64"

diff --git a/scripts/install b/scripts/install
@@ -11,7 +11,7 @@ source /usr/share/yunohost/helpers
 ynh_script_progression "Setting up source files..."
 
 mkdir -p "$install_dir/bin"
-ynh_setup_source --source_id="main" --dest_dir="$install_dir/bin"
+ynh_setup_source --source_id="scrutiny-web-linux" --dest_dir="$install_dir/bin"
 ynh_setup_source --source_id="scrutiny-collector-metrics-linux" --dest_dir="$install_dir/bin"
 
 mkdir -p "$install_dir/web"

diff --git a/scripts/upgrade b/scripts/upgrade
@@ -6,9 +6,7 @@ source /usr/share/yunohost/helpers
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
 #=================================================
-ynh_script_progression "Ensuring downward compatibility..."
-ynh_safe_rm "$install_dir/bin/scrutiny-web-linux-$YNH_ARCH"
-ynh_safe_rm "$install_dir/bin/scrutiny-collector-metrics-linux-$YNH_ARCH"
+#ynh_script_progression "Ensuring downward compatibility..."
 
 #=================================================
 # STOP SYSTEMD SERVICE
@@ -31,7 +29,7 @@ fi
 ynh_script_progression "Upgrading source files..."
 
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --source_id="main" --dest_dir="$install_dir/bin"
+ynh_setup_source --source_id="scrutiny-web-linux" --dest_dir="$install_dir/bin"
 ynh_setup_source --source_id="scrutiny-collector-metrics-linux" --dest_dir="$install_dir/bin"
 ynh_setup_source --source_id="scrutiny-web-frontend" --dest_dir="$install_dir/web"