From b2bd7818410e42e9a393553e7807037df8546a67 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Tue, 9 Nov 2021 11:23:21 +0100 Subject: use BASH_LOG instead of BASH_DEBUG --- bash-lib.sh | 8 ++++---- demo.sh | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bash-lib.sh b/bash-lib.sh index 83819df..b2bb3df 100644 --- a/bash-lib.sh +++ b/bash-lib.sh @@ -30,14 +30,14 @@ readonly CYAN WHITE="$(tput setaf 7)" readonly WHITE -readonly BASH_LIB_DEBUG_VAR="${BASH_LIB_NAME:-BASH}_DEBUG" +readonly BASH_LIB_LOG_VAR="${BASH_LIB_NAME:-BASH}_LOG" is_debug() { - [ "${!BASH_LIB_DEBUG_VAR:-0}" -ge 1 ] + [ "${!BASH_LIB_LOG_VAR:-0}" -ge 1 ] } is_trace() { - [ "${!BASH_LIB_DEBUG_VAR:-0}" -ge 2 ] + [ "${!BASH_LIB_LOG_VAR:-0}" -ge 2 ] } declare -a VERBOSE_ARG @@ -89,7 +89,7 @@ error() { critical() { error "$@" # Useful for triggering the error trap system - false + return 1 } fatal() { diff --git a/demo.sh b/demo.sh index 3de6e35..96ab4d3 100644 --- a/demo.sh +++ b/demo.sh @@ -3,8 +3,8 @@ readonly BASH_LIB_NAME=DEMO source ./bash-lib.sh -# Set `DEMO_DEBUG=1` to enable debug messages -# Set `DEMO_DEBUG=2` to enable trace messages +# Set `DEMO_LOG=1` to enable debug messages +# Set `DEMO_LOG=2` to enable trace messages trace "this is a trace message" "with additional data" debug "this is a debugging message" "with additional data" -- cgit v1.2.3