From 61508a475cc997579a8b49407c1b6d183aacaab6 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Fri, 3 Dec 2021 23:16:00 +0100
Subject: [PATCH] Remove ynh_detect_arch helper

ynh_detect_arch is deprecated in favor of YNH_ARCH
---
 conf/{x86-64.src => amd64.src} |  0
 conf/{arm.src => armhf.src}    |  0
 scripts/_common.sh             | 26 --------------------------
 scripts/install                |  2 +-
 scripts/upgrade                |  2 +-
 5 files changed, 2 insertions(+), 28 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/scripts/_common.sh b/scripts/_common.sh
index 4dd6f6b..944a65e 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -12,32 +12,6 @@
 # EXPERIMENTAL 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
-}
-
 #=================================================
 # FUTURE OFFICIAL HELPERS
 #=================================================
diff --git a/scripts/install b/scripts/install
index 29af62e..d3b1eaf 100644
--- a/scripts/install
+++ b/scripts/install
@@ -31,7 +31,7 @@ email=$(ynh_user_get_info --username=$admin --key=mail)
 password=$YNH_APP_ARG_PASSWORD
 language=$YNH_APP_ARG_LANGUAGE
 team_display_name=$YNH_APP_ARG_TEAM_DISPLAY_NAME
-architecture=$(ynh_detect_arch)
+architecture=$YNH_ARCH
 version=$YNH_APP_ARG_VERSION
 
 app=$YNH_APP_INSTANCE_NAME
diff --git a/scripts/upgrade b/scripts/upgrade
index 867c172..03e870e 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -32,7 +32,7 @@ port=$(ynh_app_setting_get --app=$app --key=port)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 language=$(ynh_app_setting_get --app=$app --key=language)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
-architecture=$(ynh_detect_arch)
+architecture=$YNH_ARCH
 version=$(ynh_app_setting_get --app=$app --key=version)
 data_path=$(ynh_app_setting_get --app=$app --key=data_path)