Remove arch helper

.github/workflows/updater.sh

@@ -64,7 +64,7 @@ echo "Handling asset at $asset_url"
 # Leave $src empty to ignore the asset
 case $asset_url in
   *"linux-arm-"*)
-    src="arm"
+    src="armhf"
     ;;
   *"linux-arm64-"*)
     src="arm64"
@@ -73,7 +73,7 @@ case $asset_url in
     src="i386"
     ;;
   *"linux-amd64-"*)
-    src="x86-64"
+    src="amd64"
     ;;
   *)
     src=""

manifest.json

@@ -25,7 +25,7 @@
         }
     ],
     "requirements": {
-        "yunohost": ">= 4.1.3"
+        "yunohost": ">= 4.3.0"
     },
     "multi_instance": true,
     "services": [
@@ -35,8 +35,7 @@
         "install": [
             {
                 "name": "domain",
-                "type": "domain",
-                "example": "example.com"
+                "type": "domain"
             },
             {
                 "name": "path",
@@ -46,8 +45,7 @@
             },
             {
                 "name": "admin",
-                "type": "user",
-                "example": "johndoe"
+                "type": "user"
             }
         ]
     }

scripts/install

@@ -27,6 +27,7 @@ ynh_abort_if_errors
 domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
 admin=$YNH_APP_ARG_ADMIN
+architecture=$YNH_ARCH
 
 app=$YNH_APP_INSTANCE_NAME
 

scripts/remove

@@ -18,6 +18,7 @@ app=$YNH_APP_INSTANCE_NAME
 
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+sync_home=$(ynh_app_setting_get --app=$app --key=sync_home)
 
 sync_port=$(ynh_app_setting_get --app=$app --key=sync_port)
 
@@ -50,6 +51,17 @@ ynh_script_progression --message="Removing app main directory..."
 # Remove the app directory securely
 ynh_secure_remove --file="$final_path"
 
+#=================================================
+# REMOVE DATA DIR
+#=================================================
+
+# Remove the app data directory with the command `yunohost app remove syncthing --purge`
+if [ "${YNH_APP_PURGE:-0}" -eq 1 ]
+then
+  ynh_script_progression --message="Removing $app data directory..." --weight=2
+  ynh_secure_remove --file="$sync_home"
+fi
+
 #=================================================
 # REMOVE NGINX CONFIGURATION
 #=================================================

scripts/restore

@@ -38,8 +38,6 @@ sync_port=$(ynh_app_setting_get --app=$app --key=sync_port)
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..."
 
-ynh_webpath_available --domain=$domain --path_url=$path_url \
-	|| ynh_die --message="Path not available: ${domain}${path_url}"
 test ! -d $final_path \
 	|| ynh_die --message="There is already a directory: $final_path "
 

scripts/upgrade

@@ -20,6 +20,7 @@ app=$YNH_APP_INSTANCE_NAME
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+architecture=$YNH_ARCH
 
 sync_home=$(ynh_app_setting_get --app=$app --key=sync_home)
 sync_port=$(ynh_app_setting_get --app=$app --key=sync_port)
@@ -100,7 +101,6 @@ if [ -z $gui_port ]; then
 	ynh_remove_logrotate
 
 	ynh_remove_app_dependencies
-
 fi
 
 # Cleaning legacy permissions

scripts/ynh_detect_arch__2

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-if [ -n "$(uname -m | grep arm64)" ] || [ -n "$(uname -m | grep aarch64)" ]; then
-	architecture="arm64"
-elif [ -n "$(uname -m | grep 64)" ]; then
-	architecture="x86-64"
-elif [ -n "$(uname -m | grep 86)" ]; then
-	architecture="i386"
-elif [ -n "$(uname -m | grep arm)" ]; then
-	architecture="arm"
-else
-	ynh_die "Unable to detect your achitecture, please open a bug describing \
-        your hardware and the result of the command \"uname -m\"." 1
-fi