From 3749a27cb23fdafe5da2ab1cd1b26e2a8a933ab6 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Tue, 25 May 2021 10:22:08 +0200 Subject: [PATCH 1/4] Support other arm architectures --- manifest.json | 2 +- scripts/_common.sh | 20 ++++++++++++++++---- scripts/install | 2 ++ scripts/update_version.sh | 3 +-- scripts/upgrade | 2 ++ 5 files changed, 22 insertions(+), 7 deletions(-) diff --git a/manifest.json b/manifest.json index 3a4bea3..909c2bb 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A movie collection manager for Usenet and BitTorrent users.", "fr": "Un gestionnaire de filmothèque pour utilisateurs de Usenet et BitTorrent." }, - "version": "3.1.1.4954~ynh1", + "version": "3.1.1.4954~ynh2", "url": "https://radarr.video", "upstream": { "license": "GPL-3.0-only", diff --git a/scripts/_common.sh b/scripts/_common.sh index 0bc0883..5f58ee2 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,10 +5,9 @@ #================================================= version="3.1.1.4954" -architecture=$(dpkg --print-architecture) -if [ $architecture = "amd64" ]; then - architecture="x64" -fi + +# Supported architectures +supported_architectures=("arm" "arm64" "x64") # dependencies used by the app pkg_dependencies="curl mediainfo sqlite3" @@ -17,6 +16,19 @@ pkg_dependencies="curl mediainfo sqlite3" # 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 4a58517..e209802 100755 --- a/scripts/install +++ b/scripts/install @@ -81,6 +81,8 @@ ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= ynh_script_progression --message="Setting up source files..." --weight=3 +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 ynh_setup_source --dest_dir="$final_path" --source_id="app.$architecture" diff --git a/scripts/update_version.sh b/scripts/update_version.sh index f16e847..03cc08f 100755 --- a/scripts/update_version.sh +++ b/scripts/update_version.sh @@ -58,8 +58,7 @@ prepare_source () { echo "$destination updated" } -architectures=("arm" "arm64" "x64") -for architecture in "${architectures[@]}"; do +for architecture in "${supported_architectures[@]}"; do prepare_source --template="../conf/app.src.default" --destination="../conf/app.$architecture.src" --architecture="$architecture" done diff --git a/scripts/upgrade b/scripts/upgrade index 7c58276..b78dc2a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -83,6 +83,8 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=3 + get_architecture + # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" --source_id="app.$architecture" fi From 350c0d8d60adfc2eaec27a97c6acab24e16be24e Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 25 May 2021 08:22:41 +0000 Subject: [PATCH 2/4] Auto-update README --- README.md | 4 ++-- README_fr.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8914a95..4595929 100644 --- a/README.md +++ b/README.md @@ -19,9 +19,9 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -A movie collection manager for Usenet and BitTorrent users. It monitors RSS feeds for new movies and will interface with clients and indexers to grab and sort them. +A movie collection manager for Usenet and BitTorrent users. -**Shipped version:** 3.1.1.4954~ynh1 +**Shipped version:** 3.1.1.4954~ynh2 diff --git a/README_fr.md b/README_fr.md index d5ad92e..acdf63d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,9 +11,9 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Vue d'ensemble -Un gestionnaire de filmothèque pour utilisateurs de Usenet et BitTorrent. Il surveille des flux RSS et s'interface avec des clients et indexeurs pour télécharger et ranger les nouveaux films. +Un gestionnaire de filmothèque pour utilisateurs de Usenet et BitTorrent. -**Version incluse:** 3.1.1.4954~ynh1 +**Version incluse:** 3.1.1.4954~ynh2 From 48f4750559c9225ebada2602594b821462e2357c Mon Sep 17 00:00:00 2001 From: tituspijean Date: Tue, 25 May 2021 10:43:40 +0200 Subject: [PATCH 3/4] Upgrade to v3.2.0.5048 --- conf/app.arm.src | 4 ++-- conf/app.arm64.src | 4 ++-- conf/app.x64.src | 4 ++-- manifest.json | 2 +- scripts/_common.sh | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/conf/app.arm.src b/conf/app.arm.src index 63d0487..c4248ed 100644 --- a/conf/app.arm.src +++ b/conf/app.arm.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Radarr/Radarr/releases/download/v3.1.1.4954/Radarr.master.3.1.1.4954.linux-core-arm.tar.gz -SOURCE_SUM=22ac36e613dd92b940e6fe8533f22fa0a10c7752eec46875da77a26d60b59f07 +SOURCE_URL=https://github.com/Radarr/Radarr/releases/download/v3.2.0.5048/Radarr.master.3.2.0.5048.linux-core-arm.tar.gz +SOURCE_SUM=7fea2d7e755de4a6a4fd34ab430c65bc8428c0d19c96957b4b192f7844973494 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/app.arm64.src b/conf/app.arm64.src index 6a44729..2267d34 100644 --- a/conf/app.arm64.src +++ b/conf/app.arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Radarr/Radarr/releases/download/v3.1.1.4954/Radarr.master.3.1.1.4954.linux-core-arm64.tar.gz -SOURCE_SUM=82a0a04e8015212f8812e9456389a8d8cb5c6f79f2169cc306a5447b044441cb +SOURCE_URL=https://github.com/Radarr/Radarr/releases/download/v3.2.0.5048/Radarr.master.3.2.0.5048.linux-core-arm64.tar.gz +SOURCE_SUM=6c00cecaa32da228acba01c5efc04d62552beab1c4383130d3966403820c5607 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/app.x64.src b/conf/app.x64.src index 2d7ea2d..245ecd2 100644 --- a/conf/app.x64.src +++ b/conf/app.x64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Radarr/Radarr/releases/download/v3.1.1.4954/Radarr.master.3.1.1.4954.linux-core-x64.tar.gz -SOURCE_SUM=e56e17d44efbf7884554fa38facf36e82348af0e99fe7d1c0e38faa66b23d839 +SOURCE_URL=https://github.com/Radarr/Radarr/releases/download/v3.2.0.5048/Radarr.master.3.2.0.5048.linux-core-x64.tar.gz +SOURCE_SUM=bae0f6dbf2bc8f11b3aa4b87b06e8dca1c4da3fed92724d7904b822a13fc94c3 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 909c2bb..9a1dd97 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A movie collection manager for Usenet and BitTorrent users.", "fr": "Un gestionnaire de filmothèque pour utilisateurs de Usenet et BitTorrent." }, - "version": "3.1.1.4954~ynh2", + "version": "3.2.0.5048~ynh1", "url": "https://radarr.video", "upstream": { "license": "GPL-3.0-only", diff --git a/scripts/_common.sh b/scripts/_common.sh index 5f58ee2..28689fd 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -version="3.1.1.4954" +version="3.2.0.5048" # Supported architectures supported_architectures=("arm" "arm64" "x64") From 563c823b130fcab8c59edda66c013af6789f32fb Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 25 May 2021 08:44:50 +0000 Subject: [PATCH 4/4] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4595929..b51b3c6 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in A movie collection manager for Usenet and BitTorrent users. -**Shipped version:** 3.1.1.4954~ynh2 +**Shipped version:** 3.2.0.5048~ynh1 diff --git a/README_fr.md b/README_fr.md index acdf63d..2e9d708 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Un gestionnaire de filmothèque pour utilisateurs de Usenet et BitTorrent. -**Version incluse:** 3.1.1.4954~ynh2 +**Version incluse:** 3.2.0.5048~ynh1