From 7093261f4f84cb994b09d22b31ad1988e7ae583e Mon Sep 17 00:00:00 2001 From: Nathaniel Landau Date: Mon, 6 Jul 2015 12:35:33 -0400 Subject: [PATCH] Minor updates --- lib/sharedFunctions.sh | 13 +++++-------- lib/utils.sh | 3 +-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/lib/sharedFunctions.sh b/lib/sharedFunctions.sh index 5a43b65..d421611 100755 --- a/lib/sharedFunctions.sh +++ b/lib/sharedFunctions.sh @@ -464,6 +464,10 @@ squeeze_lines() { # ----------------------------------- progressBar() { + if [[ ${quiet} = "true" ]] || [ ${quiet} == "1" ]; then + return + fi + local width width=30 bar_char="#" @@ -506,11 +510,4 @@ progressBar() { fi tput cnorm -} - - - - - - - +} \ No newline at end of file diff --git a/lib/utils.sh b/lib/utils.sh index 9c8f7d2..28f4b64 100755 --- a/lib/utils.sh +++ b/lib/utils.sh @@ -81,7 +81,7 @@ function header() { local _message="========== ${@} ========== "; echo "$(_ # Log messages when verbose is set to "true" verbose() { - if [ "${verbose}" = "true" ] || [ ${verbose} == "1" ]; then + if [[ "${verbose}" = "true" ]] || [ ${verbose} == "1" ]; then debug "$@" fi } @@ -111,7 +111,6 @@ do if [[ "${utility_file}" == *"utils.sh"* ]]; then continue fi - echo "Attempting to source: $utility_file" source "$utility_file" fi done