diff --git a/lib/parseOpts.sh b/lib/parseOpts.sh index 1ee6c97..139d42c 100755 --- a/lib/parseOpts.sh +++ b/lib/parseOpts.sh @@ -9,7 +9,7 @@ # of many of my scripts # # All of this taken whole-cloth from: https://github.com/kvz/bash3boilerplate -#####################################################################q +##################################################################### # Translate usage string -> getopts arguments, and set $arg_ defaults while read line; do diff --git a/lib/sharedFunctions.sh b/lib/sharedFunctions.sh index 3823a53..77e01d1 100755 --- a/lib/sharedFunctions.sh +++ b/lib/sharedFunctions.sh @@ -277,10 +277,10 @@ function skip() { REPLY=noskip read -t 5 -n 1 -s -p "${bold}To skip, press ${underline}X${reset}${bold} within 5 seconds.${reset}" if [[ "$REPLY" =~ ^[Xx]$ ]]; then - echo " Skipping!" + notice " Skipping!" return 0 else - echo " Continuing..." + notice " Continuing..." return 1 fi } diff --git a/scriptTemplate.sh b/scriptTemplate.sh index b272ff7..9bb5769 100755 --- a/scriptTemplate.sh +++ b/scriptTemplate.sh @@ -209,7 +209,7 @@ done # Trap bad exits with your cleanup function trap trapCleanup EXIT INT TERM -# Exit on error. Append ||true if you expect an error. +# Exit on error. Append '||true' when you run the script if you expect an error. set -o errexit # Run in debug mode, if set @@ -223,10 +223,9 @@ if [ "${strict}" == "1" ]; then fi # Bash will remember & return the highest exitcode in a chain of pipes. -# This way you can catch the error in case mysqldump fails in `mysqldump |gzip` +# This way you can catch the error in case mysqldump fails in `mysqldump |gzip`, for example. set -o pipefail - mainScript # Run your script safeExit # Exit cleanly \ No newline at end of file