From 83f7ee53a24c439ffe2439d2e0facaa351bf4aaf Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Mon, 21 May 2018 18:25:07 -0400 Subject: [PATCH] more beautiful fail message in recustomize --- scripts/core/functions.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index de3c3ba2..d1b9311e 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -483,9 +483,18 @@ if [ -z "$skip_all" ]; then save_terminal_title if [ ! -d "$FEISTY_MEOW_SCRIPTS/customize/$custom_user" ]; then - echo "The customization folder for '$custom_user' would be:" - echo " $FEISTY_MEOW_SCRIPTS/customize/$custom_user" - echo "but that folder does not exist. Skipping recustomization." + echo -e "the customization folder for '$custom_user' is missing: + + $FEISTY_MEOW_SCRIPTS/customize/$custom_user + +we will skip recustomization, but these other customizations are available: +" + # a little tr and sed magic to fix the carriage returns into commas. + local line="$(find $FEISTY_MEOW_SCRIPTS/customize -mindepth 1 -maxdepth 1 -type d -exec basename {} ';' | tr '\n' '&' | sed 's/&/, /g' | sed -e 's/, $//')" + # make the line feeds and carriage returns manageable with tr. + # convert the ampersand, our weird replacement for EOL, with a comma + space in sed. + # last touch with sed removes the last comma. + echo " $line" return 1 fi -- 2.34.1