From bc66a3e6fe6a4d83cc50d6259d12819edb681459 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 12 Dec 2021 18:51:53 +0100
Subject: [PATCH] arch helper

---
 conf/{x86-64.src => amd64.src} |  0
 conf/{arm.src => armhf.src}    |  0
 manifest.json                  |  2 +-
 scripts/_common.sh             | 26 --------------------------
 scripts/install                |  2 +-
 scripts/upgrade                |  2 +-
 6 files changed, 3 insertions(+), 29 deletions(-)
 rename conf/{x86-64.src => amd64.src} (100%)
 rename conf/{arm.src => armhf.src} (100%)

diff --git a/conf/x86-64.src b/conf/amd64.src
similarity index 100%
rename from conf/x86-64.src
rename to conf/amd64.src
diff --git a/conf/arm.src b/conf/armhf.src
similarity index 100%
rename from conf/arm.src
rename to conf/armhf.src
diff --git a/manifest.json b/manifest.json
index 3c843b2..a3d4fc7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -20,7 +20,7 @@
         "email": "liberodark@gmail.com"
     },
     "requirements": {
-        "yunohost": ">= 4.2.4"
+        "yunohost": ">= 4.3.0"
     },
     "multi_instance": false,
     "services": [],
diff --git a/scripts/_common.sh b/scripts/_common.sh
index f611de5..944a65e 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -15,29 +15,3 @@
 #=================================================
 # FUTURE OFFICIAL HELPERS
 #=================================================
-
-# Check the architecture
-#
-# example: architecture=$(ynh_detect_arch)
-#
-# usage: ynh_detect_arch
-#
-# Requires YunoHost version 2.2.4 or higher.
-
-ynh_detect_arch(){
-        local architecture
-        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 armv7)" ]; then
-                architecture="arm"
-        elif [ -n "$(uname -m | grep armv6)" ]; then
-                architecture="arm"
-        elif [ -n "$(uname -m | grep armv5)" ]; then
-                architecture="arm"
-        else
-                architecture="unknown"
-        fi
-        echo $architecture
-}
diff --git a/scripts/install b/scripts/install
index ef94df5..c482c20 100644
--- a/scripts/install
+++ b/scripts/install
@@ -20,7 +20,7 @@ ynh_abort_if_errors
 #=================================================
 
 # Retrieve arguments
-architecture=$(ynh_detect_arch)
+architecture=$YNH_ARCH
 
 app=$YNH_APP_INSTANCE_NAME
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 0472cf6..4abe287 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -17,7 +17,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1
 app=$YNH_APP_INSTANCE_NAME
 
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-architecture=$(ynh_detect_arch)
+architecture=$YNH_ARCH
 
 #=================================================
 # CHECK VERSION