YunoHost-Apps/plume_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/plume_ynh.git synced 2024-09-03 20:15:54 +02:00
Code Issues Activity Actions

Merge pull request #51 from YunoHost-Apps/ynh_detect_arch

Browse source 
implement ynh_detect_arch
This commit is contained in:
yalh76 2019-10-17 21:00:45 +02:00 • committed by GitHub
commit 8fc3524658
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 37 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
conf/arm.src → conf/arm64.src
View file

14
scripts/detect_arch
View file

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

9
scripts/install
View file

@ -7,7 +7,7 @@
#=================================================
source _common.sh
source detect_arch
source ynh_detect_arch__2
source /usr/share/yunohost/helpers
#=================================================
@ -41,6 +41,13 @@ app=$YNH_APP_INSTANCE_NAME
#=================================================
ynh_print_info --message="Validating installation parameters..."
architecture=$(ynh_detect_arch)
# Check machine architecture (in particular, we don't support ARM and 32bit machines)
if [ $architecture == "arm" ]
then
ynh_die --message="Sorry, but this app can only be installed on a 64 bits machine :("
fi
final_path=/var/www/$app
test ! -e "$final_path" || ynh_die --message="This path already contains a folder"

2
scripts/restore
View file

@ -7,7 +7,7 @@
#=================================================
source ../settings/scripts/_common.sh
source detect_arch
source ../settings/scripts/ynh_detect_arch__2
source /usr/share/yunohost/helpers
#=================================================

4
scripts/upgrade
View file

@ -7,7 +7,7 @@
#=================================================
source _common.sh
source detect_arch
source ynh_detect_arch__2
source /usr/share/yunohost/helpers
#=================================================
@ -29,6 +29,8 @@ secret_key=$(ynh_app_setting_get --app=$app --key=secret_key)
name=$(ynh_app_setting_get --app=$app --key=name)
port=$(ynh_app_setting_get --app=$app --key=port)
architecture=$(ynh_detect_arch)
#=================================================
# CHECK VERSION
#=================================================

25
scripts/ynh_detect_arch__2 Normal file
View file

@ -0,0 +1,25 @@
#!/bin/bash
# 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 86)" ]; then
architecture="i386"
elif [ -n "$(uname -m | grep arm)" ]; then
architecture="arm"
else
architecture="unknown"
fi
echo $architecture
}