Merge pull request #52 from YunoHost-Apps/testing

Testing

README.md

@@ -13,7 +13,7 @@ Federated blogging engine, based on ActivityPub. It uses the Rocket framework, a
 
 **Warning:** The package can take **15 to 30 minutes** to complete depending on your system configuration. **Don't intrupt the installation process while installing.**
 
-## Important points to read before installing the app
+## Important points to read before installing
 1. **Plume** is still in **pre-release** stage and undergoing heavy development, so there can be **bugs**.
 1. **Plume** require a dedicated **root domain**, eg. plume.domain.tld
 1. **Plume** require a valid **certificate** installed on the domain. Yunohost can **install Letsencrypt certificate** on the domain from **admin web-interface** or through **command-line**.
@@ -60,7 +60,6 @@ There is **No LDAP** support for Plume yet but the app can be used by multiple u
 Developers info
 ----------------
 
-**Only if you want to use a testing branch for coding, instead of merging directly into master.**
 Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/plume_ynh/tree/testing).
 
 To try the testing branch, please proceed like that.

scripts/detect_arch

@@ -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

scripts/install

@@ -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"
 

scripts/restore

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

scripts/upgrade

@@ -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
 #=================================================

scripts/ynh_detect_arch__2

@@ -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
+}