Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix relative custom backup path handling #61

Merged
merged 1 commit into from
Dec 29, 2024
Merged

Fix relative custom backup path handling #61

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions system/bin/chroot-distro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1401,9 +1401,14 @@ chroot_distro_backup() {
exit 5
fi
else
absolute_custom_path="$custom_path"
if [ "$custom_path" = "${custom_path#/}" ]; then
# can not have a relative path as current directory will change
absolute_custom_path="$PWD/$custom_path"
fi
(
cd "$chroot_distro_path" || exit 1;
tar -caf "$custom_path" "$distro"
tar -caf "$absolute_custom_path" "$distro"
)
# shellcheck disable=SC2181
if [ $? -ne 0 ]; then
Expand Down Expand Up @@ -1474,7 +1479,12 @@ chroot_distro_restore() {
if [ "" = "$custom_backup_path" ]; then
backup_path="$chroot_distro_path/.backup/$1.tar.xz"
else
backup_path="$custom_backup_path"
absolute_backup_path="$custom_backup_path"
if [ "$custom_backup_path" = "${custom_backup_path#/}" ]; then
# can not have a relative path as current directory may and will change
absolute_backup_path="$PWD/$custom_backup_path"
fi
backup_path="$absolute_backup_path"
fi

if [ ! -f "$backup_path" ]; then
Expand Down