From fafc11b888ac9602b8bfa423b588697495bb1b71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 15 Apr 2021 09:02:52 +0200 Subject: [PATCH] Testing (#29) * Upgrade to version 1.2.18 --- README.md | 10 +++++++--- README_fr.md | 10 +++++++--- conf/arm64.src | 4 ++-- conf/i386.src | 4 ++-- conf/x86_64.src | 4 ++-- manifest.json | 2 +- scripts/install | 6 ++++++ scripts/restore | 2 +- scripts/upgrade | 6 ++++++ 9 files changed, 34 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 860bd5c..8f81470 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Simple Torrent is a self-hosted remote torrent client, written in Go (golang). Started torrents remotely, download sets of files on the local disk of the server, which are then retrievable or streamable via HTTP. -**Shipped version:** 1.2.17 +**Shipped version:** 1.2.18 ## Screenshots @@ -38,8 +38,12 @@ You can also configure Simple Torrent by editing this file `/var/www/simple-torr #### Supported architectures -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/simple-torrent%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/simple-torrent/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/simple-torrent%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/simple-torrent/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/simple-torrent.svg)](https://ci-apps.yunohost.org/ci/apps/simple-torrent/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/simple-torrent.svg)](https://ci-apps-arm.yunohost.org/ci/apps/simple-torrent/) + +## Limitations + +* Sorry, this app cannot be installed on a 32-bit ARM machine. ## Links diff --git a/README_fr.md b/README_fr.md index 0cf7c96..ed7a022 100644 --- a/README_fr.md +++ b/README_fr.md @@ -12,7 +12,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install Simple Torrent est un client torrent distant auto-hébergé, écrit en Go (golang). Démarrez des torrents à distance, téléchargez des ensembles de fichiers sur le disque local du serveur, qui sont ensuite récupérables ou diffusables via HTTP. -**Version incluse :** 1.2.17 +**Version incluse :** 1.2.18 ## Captures d'écran @@ -38,8 +38,12 @@ Vous pouvez configurer Simple Torrent en modifiant le fichier `/var/www/simple-t #### Architectures supportées -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/simple-torrent%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/simple-torrent/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/simple-torrent%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/simple-torrent/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/simple-torrent.svg)](https://ci-apps.yunohost.org/ci/apps/simple-torrent/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/simple-torrent.svg)](https://ci-apps-arm.yunohost.org/ci/apps/simple-torrent/) + +## Limitations + +* Désolé, cette application ne peut pas être installée sur une machine ARM 32 bits. ## Liens diff --git a/conf/arm64.src b/conf/arm64.src index 43e89ea..a855f1c 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/boypt/simple-torrent/releases/download/1.2.17/cloud-torrent_linux_arm64.gz -SOURCE_SUM=6e4f10b77049d2758f639003323f2ddc1455a8bdc1c253048256aa85d5cf49bf +SOURCE_URL=https://github.com/boypt/simple-torrent/releases/download/1.2.18/cloud-torrent_linux_arm64.gz +SOURCE_SUM=ed93f6a878fafec0a3ff7110a80517bf81682aa66e085a7f99b9898661ac84f1 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=gz SOURCE_IN_SUBDIR=false diff --git a/conf/i386.src b/conf/i386.src index 8a6849f..15f2db6 100644 --- a/conf/i386.src +++ b/conf/i386.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/boypt/simple-torrent/releases/download/1.2.17/cloud-torrent_linux_386.gz -SOURCE_SUM=9725affd9f98e0feb0612969e387137e62dbac2d23fd669e9f8656d3715f09dd +SOURCE_URL=https://github.com/boypt/simple-torrent/releases/download/1.2.18/cloud-torrent_linux_386.gz +SOURCE_SUM=313387bb4a424714d74dccfba834325d9d9c18b8a86ed81313f974cf46898ff4 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=gz SOURCE_IN_SUBDIR=false diff --git a/conf/x86_64.src b/conf/x86_64.src index 960c76b..c964edc 100644 --- a/conf/x86_64.src +++ b/conf/x86_64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/boypt/simple-torrent/releases/download/1.2.17/cloud-torrent_linux_amd64.gz -SOURCE_SUM=5581a2e52fd083fdabe389761383417ab039ddab671de33571ed47ba560a97ff +SOURCE_URL=https://github.com/boypt/simple-torrent/releases/download/1.2.18/cloud-torrent_linux_amd64.gz +SOURCE_SUM=3240338063385ddaa38e1a6d0a3457605b4b3d2ad830c09a955823a859922f4f SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=gz SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index 8a32832..1152da4 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Self-hosted remote torrent client", "fr": "Client torrent distant auto-hébergé" }, - "version": "1.2.17~ynh1", + "version": "1.2.18~ynh1", "url": "https://github.com/boypt/simple-torrent", "license": "AGPL-3.0-only", "maintainer": { diff --git a/scripts/install b/scripts/install index a0bd77a..adda725 100644 --- a/scripts/install +++ b/scripts/install @@ -32,6 +32,12 @@ app=$YNH_APP_INSTANCE_NAME #================================================= ynh_script_progression --message="Validating installation parameters..." --weight=1 +# Check machine architecture (in particular, we don't support ARM 32bit machines) +if [ $architecture == "unknown" ] +then + ynh_die --message="Sorry, this app cannot be installed on a 32-bit ARM machine." +fi + final_path=/var/www/$app test ! -e "$final_path" || ynh_die --message="This path already contains a folder" diff --git a/scripts/restore b/scripts/restore index 0c07e67..9565f98 100644 --- a/scripts/restore +++ b/scripts/restore @@ -65,7 +65,7 @@ ynh_restore_file --origin_path="$final_path" #================================================= # RESTORE DATA #================================================= -ynh_script_progression --message="Restoring $app data..." --weight=10 +ynh_script_progression --message="Restoring $app data..." --weight=10 ynh_restore_file --origin_path="/home/yunohost.app/$app" --not_mandatory diff --git a/scripts/upgrade b/scripts/upgrade index fe09aa9..7812eac 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -35,6 +35,12 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 +# Check machine architecture (in particular, we don't support ARM 32bit machines) +if [ $architecture == "unknown" ] +then + ynh_die --message="Sorry, this app cannot be installed on a 32-bit ARM machine." +fi + # Cleaning legacy permissions if ynh_legacy_permissions_exists; then ynh_legacy_permissions_delete_all