From 4b6926c00446897b6aea02e1454e7fc2eaab7032 Mon Sep 17 00:00:00 2001 From: Jan Danielzick Date: Fri, 17 Jan 2025 11:52:54 +0100 Subject: [PATCH] system-image: improve comments and minor change to user message --- opt/system-image | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/opt/system-image b/opt/system-image index ae94c03..99d21c6 100644 --- a/opt/system-image +++ b/opt/system-image @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# used to work around cases where stdin is unavailable or not a terminal +# work around situations where stdin is unavailable or not a terminal if bash -c ': > /dev/tty' > /dev/null 2>&1; then TTY_OR_CONSOLE="/dev/tty" else @@ -22,10 +22,12 @@ function yesno { read -p "[y/n] " -n1 DISCARD_ME < $TTY_OR_CONSOLE > $TTY_OR_CONSOLE case "$DISCARD_ME" in y) + # add a line break echo_tty return 0 ;; n) + # add a line break echo_tty return 1 ;; @@ -44,7 +46,10 @@ if [ "$1" = "--yes" ]; then else DONT_ASK="false" + #TODO: use a bright color for ==== and the question + echo_tty "==========================" echo_tty "Create a new system image?" + echo_tty "==========================" echo_tty echo_tty "This will replace the existing system image with a snapshot of the currently" echo_tty "running system. Choosing no here will discard any newly installed programs," @@ -57,8 +62,6 @@ else echo_tty fi -#TODO: colors (bright white / light gray for readability) - if $DONT_ASK || yesno; then echo_tty -n "Generating exclusion list... " # cutting off the leading slash allows us to just ignore empty lines below @@ -68,6 +71,7 @@ if $DONT_ASK || yesno; then for I in ${!MOUNT_LIST[@]}; do if [ ! -z "${MOUNT_LIST[$I]}" ]; then + # check if a parent of ${MOUNT_LIST[$I]} is already in $EXCLUDE_LIST FOUND=0 for J in ${!EXCLUDE_LIST[@]}; do if grep "${EXCLUDE_LIST[$J]}" > /dev/null <<< "${MOUNT_LIST[$I]}"; then