From aa02e922776d033940bc00a4ac6eb5557194017a Mon Sep 17 00:00:00 2001 From: tituspijean Date: Tue, 25 May 2021 23:28:22 +0200 Subject: [PATCH 1/7] Improve architecture detection --- scripts/_common.sh | 19 +++++++++++++++---- scripts/install | 4 +++- scripts/upgrade | 6 ++++-- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 299c8b8..1408dc9 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,15 +4,26 @@ # COMMON VARIABLES #================================================= -architecture=$(dpkg --print-architecture) -if [ $architecture = "amd64" ]; then - architecture="x64" -fi +# Supported architectures +supported_architectures=("arm" "arm64" "x64") #================================================= # PERSONAL HELPERS #================================================= +get_architecture() { + architecture=$(dpkg --print-architecture) + if [ $architecture = "amd64" ]; then + architecture="x64" + elif [[ $architecture = arm* ]] && [[ $(getconf LONG_BIT) = 32 ]]; then + architecture="arm" + elif [[ $architecture = arm* ]] && [[ $(getconf LONG_BIT) = 64 ]]; then + architecture="arm64" + elif [[ $(echo ${supported_architectures[@]} | grep -ow "$architecture" | wc -w) = 0 ]]; then + ynh_die --message="Unsupported architecture $architecture" + fi +} + #================================================= # EXPERIMENTAL HELPERS #================================================= diff --git a/scripts/install b/scripts/install index d46a2f0..8e725a5 100755 --- a/scripts/install +++ b/scripts/install @@ -68,7 +68,9 @@ ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_script_progression --message="Setting up source files..." +ynh_script_progression --message="Setting up source files..." + +get_architecture ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src diff --git a/scripts/upgrade b/scripts/upgrade index c3019a5..3940eb4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -112,10 +112,12 @@ ynh_system_user_create --username=$app --home_dir="$final_path" if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Upgrading source files..." + ynh_script_progression --message="Upgrading source files..." + + get_architecture # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" + ynh_setup_source --dest_dir="$final_path" --source_id="app.$architecture" fi # FIXME: this should be managed by the core in the future From b83e829697918ac25d78c42ffd9bbf29990b3655 Mon Sep 17 00:00:00 2001 From: maximehua Date: Thu, 23 Sep 2021 15:22:00 +0200 Subject: [PATCH 2/7] Update README_fr.md french translation --- README_fr.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README_fr.md b/README_fr.md index cf050e1..1707c08 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Vue d'ensemble -Expliquez en *quelques* (10~15) mots l'utilité de l'app ou ce qu'elle fait (l'objectif est de donner une idée grossière pour des utilisateurs qui naviguent dans un catalogue de 100+ apps) +Jackett permet d'utiliser votre tracker favorit en fournissant une API à intégrer dans votre gestionnaire de bibliothèque. **Version incluse:** 0.18.98~ynh1 @@ -28,13 +28,13 @@ Expliquez en *quelques* (10~15) mots l'utilité de l'app ou ce qu'elle fait (l'o ## Avertissements / informations importantes -* Any known limitations, constrains or stuff not working, such as (but not limited to): - * No LDAP Support +* Toute limitation ou contrainte connue ou tout élément ne fonctionnant pas, tel que (mais non limité à) : + * Absence du support LDAP ## Documentations et ressources -* Site official de l'app : https://github.com/Jackett/Jackett +* Site officiel de l'app : https://github.com/Jackett/Jackett * Documentation officielle utilisateur: https://yunohost.org/apps * Documentation officielle de l'admin: https://yunohost.org/packaging_apps * Dépôt de code officiel de l'app: https://github.com/Jackett/Jackett @@ -52,4 +52,4 @@ or sudo yunohost app upgrade jackett -u https://github.com/YunoHost-Apps/jackett_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications:** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications:** https://yunohost.org/packaging_apps From 2d2cfec2601bdf4bd7026be58b323c30e1b86d76 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 22 Nov 2021 08:30:26 +0000 Subject: [PATCH 3/7] Auto-update README --- README.md | 21 +++++---------------- README_fr.md | 43 ++++++++++++++++++------------------------- 2 files changed, 23 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index cdea6cb..01399b6 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,3 @@ - - ---- -