From c0c3017e2bfe28a2fc6df490460a0af3fd2f430d Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 24 May 2019 04:45:09 +0200 Subject: [PATCH 1/6] add notification --- check_process | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/check_process b/check_process index f784b5f..c8a9603 100644 --- a/check_process +++ b/check_process @@ -35,7 +35,5 @@ Level 9=0 Level 10=0 ;;; Options -Email= -Notification=none - - +Email=yalh@yahoo.com +Notification=all From baa19083493f32199c2ec46f588345d4d83a0055 Mon Sep 17 00:00:00 2001 From: -h Date: Sat, 25 May 2019 16:52:06 +0100 Subject: [PATCH 2/6] [enh] Include arm binaries Should fix #14 --- scripts/install | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/install b/scripts/install index 0a74227..4fedcf6 100644 --- a/scripts/install +++ b/scripts/install @@ -75,7 +75,11 @@ ynh_print_info --message="Setting up source files..." ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src +if [ -n "$(uname -m | grep arm)" ] ; then +ynh_setup_source --dest_dir="$final_path" --source_id="arm" +else ynh_setup_source --dest_dir="$final_path" +fi #================================================= # NGINX CONFIGURATION From fdb156f320ce290cc45ecd4c3647dfb58ed06540 Mon Sep 17 00:00:00 2001 From: -h Date: Sat, 25 May 2019 16:52:06 +0100 Subject: [PATCH 3/6] [enh] Include arm binaries Should fix #14 --- conf/arm.src | 6 ++++++ scripts/install | 4 ++++ 2 files changed, 10 insertions(+) create mode 100644 conf/arm.src diff --git a/conf/arm.src b/conf/arm.src new file mode 100644 index 0000000..d20f42e --- /dev/null +++ b/conf/arm.src @@ -0,0 +1,6 @@ +SOURCE_URL=https://github.com/syncthing/syncthing/releases/download/v1.1.3/syncthing-linux-arm-v1.1.3.tar.gz +SOURCE_SUM=3589C9F308973B7D7600FD4BBA69652DFA0F752A28D05280940537E8242C8CE3 +SOURCE_SUM_PRG=sha256sum +SOURCE_FORMAT=tar.gz +SOURCE_IN_SUBDIR=true +SOURCE_FILENAME= diff --git a/scripts/install b/scripts/install index 0a74227..4fedcf6 100644 --- a/scripts/install +++ b/scripts/install @@ -75,7 +75,11 @@ ynh_print_info --message="Setting up source files..." ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src +if [ -n "$(uname -m | grep arm)" ] ; then +ynh_setup_source --dest_dir="$final_path" --source_id="arm" +else ynh_setup_source --dest_dir="$final_path" +fi #================================================= # NGINX CONFIGURATION From d9bebead1decfeb71cf0b8f7ac369595576708ed Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 28 May 2019 22:50:03 +0200 Subject: [PATCH 4/6] add new architectures --- conf/arm.src | 4 ++-- conf/arm64.src | 6 ++++++ conf/i386 | 6 ++++++ conf/{app.src => x86-64.src} | 0 scripts/detect_arch | 14 ++++++++++++++ scripts/install | 7 ++----- scripts/upgrade | 3 ++- 7 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 conf/arm64.src create mode 100644 conf/i386 rename conf/{app.src => x86-64.src} (100%) create mode 100644 scripts/detect_arch diff --git a/conf/arm.src b/conf/arm.src index d20f42e..5c0ca44 100644 --- a/conf/arm.src +++ b/conf/arm.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/syncthing/syncthing/releases/download/v1.1.3/syncthing-linux-arm-v1.1.3.tar.gz -SOURCE_SUM=3589C9F308973B7D7600FD4BBA69652DFA0F752A28D05280940537E8242C8CE3 +SOURCE_URL=https://github.com/syncthing/syncthing/releases/download/v1.1.1/syncthing-linux-arm-v1.1.1.tar.gz +SOURCE_SUM=02ed5e69a2b4a29c6e8cc5d47603678fd4ecee585cca1d54634491859a625e99 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/arm64.src b/conf/arm64.src new file mode 100644 index 0000000..a3c2185 --- /dev/null +++ b/conf/arm64.src @@ -0,0 +1,6 @@ +SOURCE_URL=https://github.com/syncthing/syncthing/releases/download/v1.1.1/syncthing-linux-arm64-v1.1.1.tar.gz +SOURCE_SUM=be333db0ec2525c2d872d5856749f2cebc582ff46b05c4d9dbfdc3726e05e6cd +SOURCE_SUM_PRG=sha256sum +SOURCE_FORMAT=tar.gz +SOURCE_IN_SUBDIR=true +SOURCE_FILENAME= diff --git a/conf/i386 b/conf/i386 new file mode 100644 index 0000000..0f34aa7 --- /dev/null +++ b/conf/i386 @@ -0,0 +1,6 @@ +SOURCE_URL=https://github.com/syncthing/syncthing/releases/download/v1.1.1/syncthing-linux-386-v1.1.1.tar.gz +SOURCE_SUM=77fff3a7967ddd18c0a4214b750708230942fd818b9d599a609d42792f1d8baf +SOURCE_SUM_PRG=sha256sum +SOURCE_FORMAT=tar.gz +SOURCE_IN_SUBDIR=true +SOURCE_FILENAME= diff --git a/conf/app.src b/conf/x86-64.src similarity index 100% rename from conf/app.src rename to conf/x86-64.src diff --git a/scripts/detect_arch b/scripts/detect_arch new file mode 100644 index 0000000..ba04b7e --- /dev/null +++ b/scripts/detect_arch @@ -0,0 +1,14 @@ +#!/bin/bash + +if [ -n "$(uname -m | grep arm64)" ] || [ -n "$(uname -m | grep aarch64)" ]; then + architecture="arm64" +elif [ -n "$(uname -m | grep 64)" ]; then + architecture="x86-64" +elif [ -n "$(uname -m | grep 86)" ]; then + architecture="i386" +elif [ -n "$(uname -m | grep arm)" ]; then + architecture="arm" +else + ynh_die "Unable to detect your achitecture, please open a bug describing \ + your hardware and the result of the command \"uname -m\"." 1 +fi diff --git a/scripts/install b/scripts/install index 4fedcf6..f83c02a 100644 --- a/scripts/install +++ b/scripts/install @@ -7,6 +7,7 @@ #================================================= source _common.sh +source detect_arch source /usr/share/yunohost/helpers #================================================= @@ -75,11 +76,7 @@ ynh_print_info --message="Setting up source files..." ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src -if [ -n "$(uname -m | grep arm)" ] ; then -ynh_setup_source --dest_dir="$final_path" --source_id="arm" -else -ynh_setup_source --dest_dir="$final_path" -fi +ynh_setup_source --dest_dir="$final_path" --source_id=$architecture #================================================= # NGINX CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index 315d4d3..4fd384d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -7,6 +7,7 @@ #================================================= source _common.sh +source detect_arch source /usr/share/yunohost/helpers #================================================= @@ -115,7 +116,7 @@ then ynh_print_info --message="Upgrading source files..." # 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=$architecture fi #================================================= From 8b790b21a2b9eb03a010bb89c6022620f8e02141 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 29 May 2019 14:14:15 +0200 Subject: [PATCH 5/6] Upgrade to 1.1.3 --- README.md | 2 +- conf/arm.src | 4 ++-- conf/arm64.src | 4 ++-- conf/i386 | 4 ++-- conf/x86-64.src | 4 ++-- manifest.json | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index c6e62bb..e8b9476 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third party and how it's transmitted over the Internet. -**Shipped version:** 1.1.1 +**Shipped version:** 1.1.3 ## Screenshots diff --git a/conf/arm.src b/conf/arm.src index 5c0ca44..97e9f7f 100644 --- a/conf/arm.src +++ b/conf/arm.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/syncthing/syncthing/releases/download/v1.1.1/syncthing-linux-arm-v1.1.1.tar.gz -SOURCE_SUM=02ed5e69a2b4a29c6e8cc5d47603678fd4ecee585cca1d54634491859a625e99 +SOURCE_URL=https://github.com/syncthing/syncthing/releases/download/v1.1.3/syncthing-linux-arm-v1.1.3.tar.gz +SOURCE_SUM=3589c9f308973b7d7600fd4bba69652dfa0f752a28d05280940537e8242c8ce3 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/arm64.src b/conf/arm64.src index a3c2185..59d73b3 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/syncthing/syncthing/releases/download/v1.1.1/syncthing-linux-arm64-v1.1.1.tar.gz -SOURCE_SUM=be333db0ec2525c2d872d5856749f2cebc582ff46b05c4d9dbfdc3726e05e6cd +SOURCE_URL=https://github.com/syncthing/syncthing/releases/download/v1.1.3/syncthing-linux-arm64-v1.1.3.tar.gz +SOURCE_SUM=ee59dd1b0cd582492b71b4ec00710243027a81c40fbaef72f94837995c4f01ba SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/i386 b/conf/i386 index 0f34aa7..b952c76 100644 --- a/conf/i386 +++ b/conf/i386 @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/syncthing/syncthing/releases/download/v1.1.1/syncthing-linux-386-v1.1.1.tar.gz -SOURCE_SUM=77fff3a7967ddd18c0a4214b750708230942fd818b9d599a609d42792f1d8baf +SOURCE_URL=https://github.com/syncthing/syncthing/releases/download/v1.1.3/syncthing-linux-386-v1.1.3.tar.gz +SOURCE_SUM=aede13f5c040320644d83231fdab3ff2e5fd2b0960b4888faa0f35b3ce3bd972 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/x86-64.src b/conf/x86-64.src index f187466..dfb8c27 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/syncthing/syncthing/releases/download/v1.1.1/syncthing-linux-amd64-v1.1.1.tar.gz -SOURCE_SUM=33554cdc9c6ed4f540cca234c10c046b40d036e24730eebe95e9cffa1c3dd61e +SOURCE_URL=https://github.com/syncthing/syncthing/releases/download/v1.1.3/syncthing-linux-amd64-v1.1.3.tar.gz +SOURCE_SUM=bb27b94d236276aac87088c554ec30fbecf2478a05f54d4ac23f801144583445 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index c70f5a4..516e812 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized.", "fr": "Syncthing remplace les services propriétaires de synchro et de cloud avec quelque chose d'ouvert, digne de confiance et décentralisée." }, - "version": "1.1.1~ynh1", + "version": "1.1.3~ynh1", "url": "https://syncthing.net/", "license": "MPL-2.0", "maintainer": [ From a84c145152e4dda97d91d7c5259a0cf885bfc2d5 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 29 May 2019 14:20:55 +0200 Subject: [PATCH 6/6] Add Check_process upgrade --- check_process | 1 + 1 file changed, 1 insertion(+) diff --git a/check_process b/check_process index c8a9603..b66b340 100644 --- a/check_process +++ b/check_process @@ -16,6 +16,7 @@ setup_private=0 setup_public=1 upgrade=1 + upgrade=1 from_commit=571623f6ea0dc6310a8d6b991b03c4a84337ce92 backup_restore=1 multi_instance=0 incorrect_path=1