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

Remove dependency on rsync, use mv instead

This commit is contained in:
Salamandar 2023-12-03 16:40:08 +01:00 committed by Salamandar
parent e5ea5b0763
commit 01de02a0cf
2 changed files with 6 additions and 6 deletions

View file

@ -55,7 +55,7 @@ ram.runtime = "50M"
[resources.ports] [resources.ports]
websocket.default = 3012 websocket.default = 3012
rocket.default = 8095 rocket.default = 8095
[resources.permissions] [resources.permissions]
main.url = "/" main.url = "/"
api.url = "/api" api.url = "/api"
@ -69,4 +69,4 @@ ram.runtime = "50M"
admin.show_tile = false admin.show_tile = false
[resources.apt] [resources.apt]
packages = "libpq5, rsync" packages = "libpq5"

View file

@ -15,15 +15,15 @@ _download_vaultwarden_from_docker() {
# 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
docker_arg="" docker_arg=""
# Fixup for armhf # Fixup for armhf
if [ $YNH_ARCH == "armhf" ]; then if [ "$YNH_ARCH" == "armhf" ]; then
docker_arg="--os_arch_variant=linux/arm/v7" docker_arg="--os_arch_variant=linux/arm/v7"
fi fi
ynh_docker_image_extract --dest_dir="$install_dir/build/" --image_spec="$pkg_image:$(ynh_app_upstream_version)" $docker_arg ynh_docker_image_extract --dest_dir="$install_dir/build/" --image_spec="$pkg_image:$(ynh_app_upstream_version)" $docker_arg
# Move files from the extract to the live directory
ynh_secure_remove --file="$install_dir/live/"
mkdir -p "$install_dir/live/" mkdir -p "$install_dir/live/"
mv -f "$install_dir/build/"{vaultwarden,web-vault} "$install_dir/live/"
mv -f "$install_dir/build/vaultwarden" "$install_dir/live/vaultwarden"
rsync -a "$install_dir/build/web-vault/" "$install_dir/live/web-vault/"
ynh_secure_remove --file="$install_dir/build" ynh_secure_remove --file="$install_dir/build"
chmod 750 "$install_dir" chmod 750 "$install_dir"