From 307f796ab51752a079f7c4189ccf1ea54aa45262 Mon Sep 17 00:00:00 2001 From: Memo <58190287+memo-567@users.noreply.github.com> Date: Tue, 19 Apr 2022 16:56:14 +0200 Subject: [PATCH 1/2] Update install Stop the installation script if the system is not x64. --- scripts/install | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/install b/scripts/install index 6b2e860..628d669 100755 --- a/scripts/install +++ b/scripts/install @@ -35,6 +35,12 @@ app=$YNH_APP_INSTANCE_NAME #================================================= ynh_script_progression --message="Validating installation parameters..." --weight=1 +# Check machine architecture (in particular, we don't support ARM and 32bit machines) +if [ $YNH_ARCH == "i386" ] || [ $YNH_ARCH == "armel" ] || [ $YNH_ARCH == "armhf" ] +then + ynh_die --message="Sorry, but this app can only be installed on a x86, 64 bits machine :(" +fi + final_path=/var/www/$app test ! -e "$final_path" || ynh_die --message="This path already contains a folder" From 2cdfd358dff1a14f67ef3cc3e1755bcedb4f0116 Mon Sep 17 00:00:00 2001 From: Memo <58190287+memo-567@users.noreply.github.com> Date: Thu, 21 Apr 2022 20:23:35 +0200 Subject: [PATCH 2/2] Update scripts/install Co-authored-by: tituspijean --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 628d669..eedcf6a 100755 --- a/scripts/install +++ b/scripts/install @@ -36,9 +36,9 @@ app=$YNH_APP_INSTANCE_NAME ynh_script_progression --message="Validating installation parameters..." --weight=1 # Check machine architecture (in particular, we don't support ARM and 32bit machines) -if [ $YNH_ARCH == "i386" ] || [ $YNH_ARCH == "armel" ] || [ $YNH_ARCH == "armhf" ] +if [ $YNH_ARCH != "amd64" ] && [ $YNH_ARCH != "aarch64" ] && [ $YNH_ARCH != "arm64" ] then - ynh_die --message="Sorry, but this app can only be installed on a x86, 64 bits machine :(" + ynh_die --message="Sorry, but this app can only be installed on a 64 bits machine :(" fi final_path=/var/www/$app