Merge pull request #2 from YunoHost-Apps/testing

Improve arm support and update to v3.2.0.5048

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.2.0.5048~ynh1
 
 
 

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.2.0.5048~ynh1
 
 
 

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_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=22ac36e613dd92b940e6fe8533f22fa0a10c7752eec46875da77a26d60b59f07
+SOURCE_SUM=7fea2d7e755de4a6a4fd34ab430c65bc8428c0d19c96957b4b192f7844973494
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

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_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=82a0a04e8015212f8812e9456389a8d8cb5c6f79f2169cc306a5447b044441cb
+SOURCE_SUM=6c00cecaa32da228acba01c5efc04d62552beab1c4383130d3966403820c5607
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

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_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=e56e17d44efbf7884554fa38facf36e82348af0e99fe7d1c0e38faa66b23d839
+SOURCE_SUM=bae0f6dbf2bc8f11b3aa4b87b06e8dca1c4da3fed92724d7904b822a13fc94c3
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

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.2.0.5048~ynh1",
     "url": "https://radarr.video",
     "upstream": {
         "license": "GPL-3.0-only",

scripts/_common.sh

@@ -4,11 +4,10 @@
 # COMMON VARIABLES
 #=================================================
 
-version="3.1.1.4954"
+version="3.2.0.5048"
-architecture=$(dpkg --print-architecture)
+
-if [ $architecture = "amd64" ]; then
+# Supported architectures
-  architecture="x64"
+supported_architectures=("arm" "arm64" "x64")
-fi
 
 # 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
 #=================================================

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"

scripts/update_version.sh

@@ -58,8 +58,7 @@ prepare_source () {
     echo "$destination updated"
 }
 
-architectures=("arm" "arm64" "x64")
+for architecture in "${supported_architectures[@]}"; do
-for architecture in "${architectures[@]}"; do
 	prepare_source --template="../conf/app.src.default" --destination="../conf/app.$architecture.src" --architecture="$architecture"
 done
 

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