1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/vaultwarden_ynh.git synced 2024-09-03 18:26:31 +02:00

Fix armhf

This commit is contained in:
yalh76 2022-10-19 23:05:00 +02:00
parent cd674d9860
commit 8ebc97ebf2
4 changed files with 17 additions and 3 deletions

View file

@ -6,7 +6,7 @@
"en": "Manage passwords and other sensitive informations", "en": "Manage passwords and other sensitive informations",
"fr": "Gérez les mots de passe et autres informations sensibles" "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", "url": "https://github.com/dani-garcia/vaultwarden",
"upstream": { "upstream": {
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",

View file

@ -93,7 +93,12 @@ ynh_script_progression --message="Setting up source files..."
ynh_app_setting_set --app=$app --key=final_path --value=$final_path ynh_app_setting_set --app=$app --key=final_path --value=$final_path
# Download, check integrity, uncompress and patch the source from app.src # 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/" mkdir -p "$final_path/live/"
chmod 750 "$final_path" chmod 750 "$final_path"

View file

@ -143,7 +143,12 @@ then
ynh_script_progression --message="Upgrading source files..." ynh_script_progression --message="Upgrading source files..."
# Download, check integrity, uncompress the source of vaultwarden from app.src to his build directory # 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/" mkdir -p "$final_path/live/"
fi fi

View file

@ -37,6 +37,10 @@ ynh_docker_image_extract() {
local os_arch_variant local os_arch_variant
# Manage arguments with getopts # Manage arguments with getopts
ynh_handle_getopts_args "$@" ynh_handle_getopts_args "$@"
if [ $YNH_ARCH == "armhf" ]
then
YNH_ARCH="arm/v7"
fi
os_arch_variant="${os_arch_variant:-"linux/$YNH_ARCH"}" os_arch_variant="${os_arch_variant:-"linux/$YNH_ARCH"}"
# Extract source into the app dir # Extract source into the app dir