From 8ebc97ebf2b4ab6757ffda7be595ee91da922c02 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 19 Oct 2022 23:05:00 +0200 Subject: [PATCH 1/5] Fix armhf --- manifest.json | 2 +- scripts/install | 7 ++++++- scripts/upgrade | 7 ++++++- scripts/ynh_docker_image_extract | 4 ++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index 7c3f5d0..2d0a2ce 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Manage passwords and other sensitive informations", "fr": "Gérez les mots de passe et autres informations sensibles" }, - "version": "1.26.0~ynh1", + "version": "1.26.0~ynh2", "url": "https://github.com/dani-garcia/vaultwarden", "upstream": { "license": "GPL-3.0-or-later", diff --git a/scripts/install b/scripts/install index 1e26415..42a998c 100644 --- a/scripts/install +++ b/scripts/install @@ -93,7 +93,12 @@ ynh_script_progression --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 -ynh_docker_image_extract --dest_dir="$final_path/build/" --image_spec="$pkg_image:$(ynh_app_upstream_version)" +docker_arg="" +if [ $YNH_ARCH == "armhf" ] +then + docker_arg="--os_arch_variant=\"linux/arm/v7\"" +fi +ynh_docker_image_extract --dest_dir="$final_path/build/" --image_spec="$pkg_image:$(ynh_app_upstream_version)" $docker_arg mkdir -p "$final_path/live/" chmod 750 "$final_path" diff --git a/scripts/upgrade b/scripts/upgrade index e719e01..c738f82 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -143,7 +143,12 @@ then ynh_script_progression --message="Upgrading source files..." # Download, check integrity, uncompress the source of vaultwarden from app.src to his build directory - ynh_docker_image_extract --dest_dir="$final_path/build/" --image_spec="$pkg_image:$(ynh_app_upstream_version)" + docker_arg="" + if [ $YNH_ARCH == "armhf" ] + then + docker_arg="--os_arch_variant=\"linux/arm/v7\"" + fi + ynh_docker_image_extract --dest_dir="$final_path/build/" --image_spec="$pkg_image:$(ynh_app_upstream_version)" $docker_arg mkdir -p "$final_path/live/" fi diff --git a/scripts/ynh_docker_image_extract b/scripts/ynh_docker_image_extract index 4c19d13..602ae94 100644 --- a/scripts/ynh_docker_image_extract +++ b/scripts/ynh_docker_image_extract @@ -37,6 +37,10 @@ ynh_docker_image_extract() { local os_arch_variant # Manage arguments with getopts ynh_handle_getopts_args "$@" + if [ $YNH_ARCH == "armhf" ] + then + YNH_ARCH="arm/v7" + fi os_arch_variant="${os_arch_variant:-"linux/$YNH_ARCH"}" # Extract source into the app dir From cb37e978f5b6a405f4fd06b1abd5f40ef0b0b250 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 19 Oct 2022 21:05:07 +0000 Subject: [PATCH 2/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 1c1efd0..256b37e 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Alternative implementation of the Bitwarden server API written in Rust and compatible with upstream Bitwarden clients*, perfect for self-hosted deployment where running the official resource-heavy service might not be ideal. -**Shipped version:** 1.26.0~ynh1 +**Shipped version:** 1.26.0~ynh2 **Demo:** https://vault.bitwarden.com/#/register diff --git a/README_fr.md b/README_fr.md index f60c976..904c229 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Alternative implementation of the Bitwarden server API written in Rust and compatible with upstream Bitwarden clients*, perfect for self-hosted deployment where running the official resource-heavy service might not be ideal. -**Version incluse :** 1.26.0~ynh1 +**Version incluse :** 1.26.0~ynh2 **Démo :** https://vault.bitwarden.com/#/register From 2331137f80e85bbd070c7de61de9f11d296e9ffd Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 19 Oct 2022 23:06:23 +0200 Subject: [PATCH 3/5] Update ynh_docker_image_extract --- scripts/ynh_docker_image_extract | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/ynh_docker_image_extract b/scripts/ynh_docker_image_extract index 602ae94..4c19d13 100644 --- a/scripts/ynh_docker_image_extract +++ b/scripts/ynh_docker_image_extract @@ -37,10 +37,6 @@ ynh_docker_image_extract() { local os_arch_variant # Manage arguments with getopts ynh_handle_getopts_args "$@" - if [ $YNH_ARCH == "armhf" ] - then - YNH_ARCH="arm/v7" - fi os_arch_variant="${os_arch_variant:-"linux/$YNH_ARCH"}" # Extract source into the app dir From 71ca20bdddab7a64d0851f916915a99683d552a2 Mon Sep 17 00:00:00 2001 From: mtenders <64332767+mtenders@users.noreply.github.com> Date: Thu, 20 Oct 2022 15:08:16 +0200 Subject: [PATCH 4/5] remove quotes --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index c738f82..7df7129 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -146,7 +146,7 @@ then docker_arg="" if [ $YNH_ARCH == "armhf" ] then - docker_arg="--os_arch_variant=\"linux/arm/v7\"" + docker_arg="--os_arch_variant=linux/arm/v7" fi ynh_docker_image_extract --dest_dir="$final_path/build/" --image_spec="$pkg_image:$(ynh_app_upstream_version)" $docker_arg mkdir -p "$final_path/live/" From 4d51700d9219ed447b22bd31c085a27637ba4f2f Mon Sep 17 00:00:00 2001 From: mtenders <64332767+mtenders@users.noreply.github.com> Date: Thu, 20 Oct 2022 15:09:03 +0200 Subject: [PATCH 5/5] Remove quotes --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 42a998c..848df74 100644 --- a/scripts/install +++ b/scripts/install @@ -96,7 +96,7 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path docker_arg="" if [ $YNH_ARCH == "armhf" ] then - docker_arg="--os_arch_variant=\"linux/arm/v7\"" + docker_arg="--os_arch_variant=linux/arm/v7" fi ynh_docker_image_extract --dest_dir="$final_path/build/" --image_spec="$pkg_image:$(ynh_app_upstream_version)" $docker_arg mkdir -p "$final_path/live/"