X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Ffunctions.sh;h=494c43c55aa5356932891fb6e77384f222946211;hb=2e93c29a45ae9d58694c0de962151e6829739380;hp=c60c94319e4e24d126e700465c66e9ece8edcecd;hpb=00e8a2f35de87987880cd5b46a1c7e4bee8c68dd;p=feisty_meow.git diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index c60c9431..494c43c5 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -144,7 +144,7 @@ if [ -z "$skip_all" ]; then function test_or_die() { if [ $? -ne 0 ]; then - echo -e "\n\naction failed: $*\n\nExiting script..." + echo -e "\n\naction failed: $*\n\n*** Exiting script..." error_sound exit 1 fi @@ -154,7 +154,7 @@ if [ -z "$skip_all" ]; then function test_or_continue() { if [ $? -ne 0 ]; then - echo -e "\n\nerror occurred: $*\n\nContinuing script..." + echo -e "\n\nerror occurred: $*\n\n=> Continuing script..." error_sound fi } @@ -452,6 +452,8 @@ if [ -z "$skip_all" ]; then unalias CORE_ALIASES_LOADED &>/dev/null unset -f function_sentinel # reload feisty meow environment in current shell. + echo "reloading the feisty meow scripts." + echo source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh" # run nechung oracle to give user a new fortune. nechung @@ -465,15 +467,15 @@ if [ -z "$skip_all" ]; then local custom_user="$1"; shift if [ -z "$custom_user" ]; then # use our default example user if there was no name provided. - custom_user=fred + custom_user=$(logname) fi save_terminal_title if [ ! -d "$FEISTY_MEOW_SCRIPTS/customize/$custom_user" ]; then - echo "The customization folder provided for $custom_user should be:" - echo " '$FEISTY_MEOW_SCRIPTS/customize/$custom_user'" - echo "but that folder does not exist. Skipping customization." + 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." return 1 fi @@ -928,6 +930,16 @@ return 0 ############## + # site avenger aliases + function switchto() + { + THISDIR="$FEISTY_MEOW_SCRIPTS/site_avenger" + source "$FEISTY_MEOW_SCRIPTS/site_avenger/shared_site_mgr.sh" + switch_to "$1" + } + + ############## + # NOTE: no more function definitions are allowed after this point. function function_sentinel()