Skip to content

fix(update): always remove temp dir on exit #15

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

Open
CheapFuck wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(update): always remove temp dir on exit #15

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
15 changes: 12 additions & 3 deletions user/local/share/towel/bin/towel-update
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,16 @@ if [ "$assume_yes" != "true" ]; then
fi

tmpdir="$(/usr/bin/mktemp -d)"
trap '/usr/bin/rm -rf "$tmpdir"' EXIT
restore_backup=""

function _towel_update_cleanup() {
if [ -n "$restore_backup" ]; then
rm -rf "$TOWEL_DATA"
mv "$backup_current" "$TOWEL_DATA" 2>/dev/null
fi
/usr/bin/rm -rf "$tmpdir"
}
trap _towel_update_cleanup EXIT

base_url="https://github.com/${TOWEL_GITHUB_REPO}/releases/download/v${latest_version}"
tarball="towel-${latest_version}.tar.gz"
Expand Down Expand Up @@ -214,15 +223,15 @@ source "$src/user/local/share/towel/bin/towel-common"

backup_current="${TOWEL_DATA}.backup.$(date +%s)"
mv "$TOWEL_DATA" "$backup_current" 2>/dev/null || true
trap 'rm -rf "$TOWEL_DATA"; mv "$backup_current" "$TOWEL_DATA" 2>/dev/null' EXIT
restore_backup="1"

towel_install_from_dir "$src" || {
echo 1>&2 "towel update --apply failed: installation error"
exit 1
}

rm -rf "$backup_current"
trap - EXIT
restore_backup=""
echo "towel updated to $latest_version."
echo "Note: distrobox/containers configs were not refreshed."
echo " Re-run ./install from the tarball to update those."