From 5c82a4ffb6f7e866a8b11d9a44960712905934aa Mon Sep 17 00:00:00 2001 From: Dennis ten Hoove Date: Sun, 19 Jan 2025 00:25:28 +0100 Subject: [PATCH] [arkdep] Code cleanup --- arkdep | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arkdep b/arkdep index 5be8e66..0e63e20 100755 --- a/arkdep +++ b/arkdep @@ -582,8 +582,8 @@ remove_deployment () { # Ensure the deployment and all sub-volumes are writable for volume in $(btrfs subvolume list / | grep -oE '[^ ]+$' | grep $target); do - 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" + 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" done # Remove the deployment @@ -602,8 +602,8 @@ remove_deployment () { cleanup_and_quit 'Failed to update tracker file' fi - mv $arkdep_dir/tracker_tmp $arkdep_dir/tracker \ - || cleanup_and_quit 'Failed to move tracker_tmp file to tracker' + mv $arkdep_dir/tracker_tmp $arkdep_dir/tracker || + cleanup_and_quit 'Failed to move tracker_tmp file to tracker' # Remove images from cache if requested 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 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 - 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 unlock_and_quit 1