apadana/arkdep
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[arkdep] Code cleanup

Browse source
This commit is contained in:
Dennis ten Hoove 2025-01-19 00:25:28 +01:00
parent ff138b607c
commit 5c82a4ffb6
No known key found for this signature in database
GPG key ID: 2BA91DC2563B83D1
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
arkdep
View file

@ -582,8 +582,8 @@ remove_deployment () {
# Ensure the deployment and all sub-volumes are writable # Ensure the deployment and all sub-volumes are writable
for volume in $(btrfs subvolume list / | grep -oE '[^ ]+$' | grep $target); do for volume in $(btrfs subvolume list / | grep -oE '[^ ]+$' | grep $target); do
btrfs property set -f -ts $(readlink -m $ARKDEP_ROOT/$volume) ro false \ btrfs property set -f -ts $(readlink -m $ARKDEP_ROOT/$volume) ro false ||
|| printf "\e[1;33m<!>\e[0m\e[1m Failed to make subvolume $volume writable\e[0m\n" printf "\e[1;33m<!>\e[0m\e[1m Failed to make subvolume $volume writable\e[0m\n"
done done
# Remove the deployment # Remove the deployment
@ -602,8 +602,8 @@ remove_deployment () {
cleanup_and_quit 'Failed to update tracker file' cleanup_and_quit 'Failed to update tracker file'
fi fi
mv $arkdep_dir/tracker_tmp $arkdep_dir/tracker \ mv $arkdep_dir/tracker_tmp $arkdep_dir/tracker ||
|| cleanup_and_quit 'Failed to move tracker_tmp file to tracker' cleanup_and_quit 'Failed to move tracker_tmp file to tracker'
# Remove images from cache if requested # Remove images from cache if requested
if [[ $clean_cache_on_remove -eq 1 ]]; then if [[ $clean_cache_on_remove -eq 1 ]]; then
@ -1313,9 +1313,9 @@ layer () {
# Notify user of changes and ask for permission if interactive_mode is enabled # Notify user of changes and ask for permission if interactive_mode is enabled
printf '\e[1;34m-->\e[0m\e[1m The following packages will be layered\e[0m\n' printf '\e[1;34m-->\e[0m\e[1m The following packages will be layered\e[0m\n'
printf "${progs_clean[@]}" | column echo "${progs_clean[@]}" | column
if [[ $interactive_mode -eq 1 ]]; then if [[ $interactive_mode -eq 1 ]]; then
read -p 'Proceed with removal? [Y/n] ' remove_confirm read -p 'Proceed with installation? [Y/n] ' remove_confirm
if [[ ! $remove_confirm =~ ^(y|Y|yes|YES|)$ ]]; then if [[ ! $remove_confirm =~ ^(y|Y|yes|YES|)$ ]]; then
unlock_and_quit 1 unlock_and_quit 1