From 1bff69001f4632c4d8d51455f432e6fb3f62a185 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 8 Dec 2021 06:18:51 +0000 Subject: [PATCH 1/3] Upgrade to v1.18.5 --- conf/amd64.src | 4 ++-- conf/arm64.src | 4 ++-- conf/armhf.src | 4 ++-- conf/i386.src | 4 ++-- manifest.json | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/conf/amd64.src b/conf/amd64.src index 061f95c..3e50ed2 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/syncthing/syncthing/releases/download/v1.18.4/syncthing-linux-amd64-v1.18.4.tar.gz -SOURCE_SUM=bc43dfb1ab62222933c564822b892515fc724cdddf789a3eebc9ecd902f515df +SOURCE_URL=https://github.com/syncthing/syncthing/releases/download/v1.18.5/syncthing-linux-amd64-v1.18.5.tar.gz +SOURCE_SUM=f7c5f1f7d8169e33e4f4e5b0016115cacd4f40ecf42ad5f0acf445d121ea47a0 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/arm64.src b/conf/arm64.src index e9d487a..0a640f2 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/syncthing/syncthing/releases/download/v1.18.4/syncthing-linux-arm64-v1.18.4.tar.gz -SOURCE_SUM=1fe0f89c8d769689d2e2b676ea5126d660e8c9ecdb62c6cc58b33ffeded34636 +SOURCE_URL=https://github.com/syncthing/syncthing/releases/download/v1.18.5/syncthing-linux-arm64-v1.18.5.tar.gz +SOURCE_SUM=9d7dcc8838699b4b2b8356b2cbadcdaf3432aadd33a1ce838ef6cc056834227b SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/armhf.src b/conf/armhf.src index 80ba855..15cf33e 100644 --- a/conf/armhf.src +++ b/conf/armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/syncthing/syncthing/releases/download/v1.18.4/syncthing-linux-arm-v1.18.4.tar.gz -SOURCE_SUM=81c872358ddb364d06a522db219e3368dcc3285b4491e08459b918efd93c31fd +SOURCE_URL=https://github.com/syncthing/syncthing/releases/download/v1.18.5/syncthing-linux-arm-v1.18.5.tar.gz +SOURCE_SUM=9a8f1c0e6e3443c21d33c7801ffbd92e860d5839fd6f488146af843210cfdf23 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/i386.src b/conf/i386.src index fd0c03a..4e04b42 100644 --- a/conf/i386.src +++ b/conf/i386.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/syncthing/syncthing/releases/download/v1.18.4/syncthing-linux-386-v1.18.4.tar.gz -SOURCE_SUM=f7e55a74011253ea4c2cbd3701a4a24ee8a23f78153362fca87ebec747727b06 +SOURCE_URL=https://github.com/syncthing/syncthing/releases/download/v1.18.5/syncthing-linux-386-v1.18.5.tar.gz +SOURCE_SUM=520e5baf4c39abd04a1a8fc0f303ae9bd0f349a7fd36a62a7e2e64d9bb2ad3e0 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 3a7fd33..34a6917 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Continuous file synchronization program.", "fr": "Programme de synchronisation de fichiers en continu." }, - "version": "1.18.4~ynh2", + "version": "1.18.5~ynh1", "url": "https://syncthing.net/", "upstream": { "license": "MPL-2.0", From 891f5bb5ac8edcc3fd80979e25c6b42d9315249b Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Wed, 8 Dec 2021 06:18:57 +0000 Subject: [PATCH 2/3] 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 6dcdb17..5919f39 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Syncthing is a continuous file synchronization program. It synchronizes files between two or more computers in real time, safely protected from prying eyes. Your data is your data alone and you deserve to choose where it is stored, whether it is shared with some third party, and how it's transmitted over the internet. -**Shipped version:** 1.18.4~ynh2 +**Shipped version:** 1.18.5~ynh1 diff --git a/README_fr.md b/README_fr.md index 9654a23..378b1f0 100644 --- a/README_fr.md +++ b/README_fr.md @@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Syncthing is a continuous file synchronization program. It synchronizes files between two or more computers in real time, safely protected from prying eyes. Your data is your data alone and you deserve to choose where it is stored, whether it is shared with some third party, and how it's transmitted over the internet. -**Version incluse :** 1.18.4~ynh2 +**Version incluse :** 1.18.5~ynh1 From a1d30452e5881c9b403f65f02f77936e2db5019a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 9 Dec 2021 12:11:48 +0100 Subject: [PATCH 3/3] Fix --- check_process | 6 +++--- manifest.json | 4 ++-- scripts/change_url | 4 ---- scripts/restore | 3 +-- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/check_process b/check_process index 788f498..6c257c7 100644 --- a/check_process +++ b/check_process @@ -1,8 +1,8 @@ ;; Test complet ; Manifest - domain="domain.tld" (DOMAIN) - path="/path" (PATH) - admin="john" (USER) + domain="domain.tld" + path="/path" + admin="john" ; Checks pkg_linter=1 setup_sub_dir=1 diff --git a/manifest.json b/manifest.json index 34a6917..4f30601 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "syncthing", "packaging_format": 1, "description": { - "en": "Continuous file synchronization program.", - "fr": "Programme de synchronisation de fichiers en continu." + "en": "Continuous file synchronization program", + "fr": "Programme de synchronisation de fichiers en continu" }, "version": "1.18.5~ynh1", "url": "https://syncthing.net/", diff --git a/scripts/change_url b/scripts/change_url index d6bb455..ff22c50 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -29,10 +29,6 @@ ynh_script_progression --message="Loading installation settings..." # Needed for helper "ynh_add_nginx_config" final_path=$(ynh_app_setting_get --app=$app --key=final_path) -# Add settings here as needed by your application -#db_name=$(ynh_app_setting_get --app=$app --key=db_name) -#db_user=$db_name -#db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd) gui_port=$(ynh_app_setting_get --app=$app --key=gui_port) #================================================= diff --git a/scripts/restore b/scripts/restore index c7a2f0b..c327c7c 100644 --- a/scripts/restore +++ b/scripts/restore @@ -38,8 +38,7 @@ sync_port=$(ynh_app_setting_get --app=$app --key=sync_port) #================================================= ynh_script_progression --message="Validating restoration parameters..." -test ! -d $final_path \ - || ynh_die --message="There is already a directory: $final_path " +test ! -d $final_path || ynh_die --message="There is already a directory: $final_path " #================================================= # STANDARD RESTORATION STEPS