From 8acb18d508ea634f91181cc4719a6ad6d32a9ad5 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 2 Feb 2022 19:17:21 +0100 Subject: [PATCH 1/5] add arm --- conf/{app.src => amd64.src} | 0 conf/armhf.src | 6 ++++++ scripts/install | 3 ++- scripts/upgrade | 3 ++- 4 files changed, 10 insertions(+), 2 deletions(-) rename conf/{app.src => amd64.src} (100%) create mode 100644 conf/armhf.src diff --git a/conf/app.src b/conf/amd64.src similarity index 100% rename from conf/app.src rename to conf/amd64.src diff --git a/conf/armhf.src b/conf/armhf.src new file mode 100644 index 0000000..32e984a --- /dev/null +++ b/conf/armhf.src @@ -0,0 +1,6 @@ +SOURCE_URL=https://github.com/YunoHost-Apps/shiori_ynh/releases/download/v1.5.0/shiori +SOURCE_SUM=c29696b47072e3a849d1f3c889839d4ac8aa918e83685f0a7137a1e8204d2a67 +SOURCE_SUM_PRG=sha256sum +SOURCE_IN_SUBDIR=false +SOURCE_FILENAME=shiori +SOURCE_EXTRACT=false diff --git a/scripts/install b/scripts/install index 4b42d76..b2e8e1e 100755 --- a/scripts/install +++ b/scripts/install @@ -23,6 +23,7 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url="/" is_public=$YNH_APP_ARG_IS_PUBLIC +architecture=$YNH_ARCH app=$YNH_APP_INSTANCE_NAME @@ -71,7 +72,7 @@ ynh_script_progression --message="Setting up source files..." --weight=1 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" +ynh_setup_source --dest_dir="$final_path" --source_id="$architecture" chmod 750 "$final_path" chmod -R o-rwx "$final_path" diff --git a/scripts/upgrade b/scripts/upgrade index f07e442..a8c2518 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -21,6 +21,7 @@ path_url=$(ynh_app_setting_get --app=$app --key=path) port=$(ynh_app_setting_get --app=$app --key=port) final_path=$(ynh_app_setting_get --app=$app --key=final_path) datadir=$(ynh_app_setting_get --app=$app --key=datadir) +architecture=$YNH_ARCH #================================================= # CHECK VERSION @@ -68,7 +69,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=1 # 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 chmod 750 "$final_path" From 2a912e513e34dd428d824c67700313754ed2620a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 2 Feb 2022 19:48:56 +0100 Subject: [PATCH 2/5] Update armhf.src --- conf/armhf.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/armhf.src b/conf/armhf.src index 32e984a..77d9d56 100644 --- a/conf/armhf.src +++ b/conf/armhf.src @@ -1,5 +1,5 @@ SOURCE_URL=https://github.com/YunoHost-Apps/shiori_ynh/releases/download/v1.5.0/shiori -SOURCE_SUM=c29696b47072e3a849d1f3c889839d4ac8aa918e83685f0a7137a1e8204d2a67 +SOURCE_SUM=66497519645eeac893544d3f0fd496c497745731efae73ec356f550d9ec61f8f SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=shiori From 003fe74c071e4291e7c6cbc1041f3e6a1aaeeda2 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 2 Feb 2022 20:36:57 +0100 Subject: [PATCH 3/5] Update armhf.src --- conf/armhf.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/armhf.src b/conf/armhf.src index 77d9d56..d3c6a12 100644 --- a/conf/armhf.src +++ b/conf/armhf.src @@ -1,5 +1,5 @@ SOURCE_URL=https://github.com/YunoHost-Apps/shiori_ynh/releases/download/v1.5.0/shiori -SOURCE_SUM=66497519645eeac893544d3f0fd496c497745731efae73ec356f550d9ec61f8f +SOURCE_SUM=cbb32331153a97aa68fb1b2320ca6fe76924f939bcfae88d326a09af1372b0fe SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=shiori From dd685fa8a7ad5584897049869998ded2b9b785b0 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 2 Feb 2022 20:59:06 +0100 Subject: [PATCH 4/5] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 91caae0..2e5e984 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Simple bookmark manager", "fr": "Gestionnaire de liens simple" }, - "version": "1.5.0~ynh1", + "version": "1.5.0~ynh2", "url": "https://github.com/go-shiori/shiori", "upstream": { "license": "MIT", From 9b0a1fee77a191e4b53f06c44450b6c32a09ccaf Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Wed, 2 Feb 2022 19:59:13 +0000 Subject: [PATCH 5/5] 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 db42954..27abdc9 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Shiori is a simple bookmarks manager written in Go language. Intended as a simpl [Shiori Web Extension](https://github.com/go-shiori/shiori-web-ext) is a simple extension for managing bookmarks using Shiori. This extension is intended to integrate Shiori with your favorite web browser. This way, you can save and remove bookmarks in Shiori without switching from your current page. -**Shipped version:** 1.5.0~ynh1 +**Shipped version:** 1.5.0~ynh2 **Demo:** https://demo.example.com diff --git a/README_fr.md b/README_fr.md index 58c40b5..f474610 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ Shiori is a simple bookmarks manager written in Go language. Intended as a simpl [Shiori Web Extension](https://github.com/go-shiori/shiori-web-ext) is a simple extension for managing bookmarks using Shiori. This extension is intended to integrate Shiori with your favorite web browser. This way, you can save and remove bookmarks in Shiori without switching from your current page. -**Version incluse :** 1.5.0~ynh1 +**Version incluse :** 1.5.0~ynh2 **Démo :** https://demo.example.com