m/shell-scripting-templates
1
0
Fork 0
mirror of https://github.com/natelandau/shell-scripting-templates.git synced 2025-11-11 06:23:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

_execute_: ensure quiet mode doesn't print output

Browse Source
This commit is contained in:
Nathaniel Landau
2021-09-10 16:05:43 -04:00
parent b5d12b8239
commit e014a1dc2a
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
utilities/baseHelpers.bash
View File

@@ -63,7 +63,10 @@ _execute_() {
fi fi
elif ${VERBOSE}; then elif ${VERBOSE}; then
if eval "${CMD}"; then if eval "${CMD}"; then
if "${ECHO_RESULT}"; then if "${QUIET_RESULT}"; then
VERBOSE=${SAVE_VERBOSE}
return 0
elif "${ECHO_RESULT}"; then
echo "${EXECUTE_MESSAGE}" echo "${EXECUTE_MESSAGE}"
elif "${SUCCESS_RESULT}"; then elif "${SUCCESS_RESULT}"; then
success "${EXECUTE_MESSAGE}" success "${EXECUTE_MESSAGE}"
@@ -194,7 +197,7 @@ _progressBar_() {
($QUIET) && return ($QUIET) && return
($VERBOSE) && return ($VERBOSE) && return
[ ! -t 1 ] && return # Do nothing if the output is not a terminal [ ! -t 1 ] && return # Do nothing if the output is not a terminal
[ $1 == 1 ] && return # Do nothing with a single element [ $1 == 1 ] && return # Do nothing with a single element
local width bar_char perc num bar progressBarLine barTitle n local width bar_char perc num bar progressBarLine barTitle n
@@ -304,6 +307,7 @@ _seekConfirmation_() {
# something # something
# fi # fi
local yn
input "${1:-}" input "${1:-}"
if "${FORCE}"; then if "${FORCE}"; then
debug "Forcing confirmation with '--force' flag set" debug "Forcing confirmation with '--force' flag set"
@@ -355,7 +359,7 @@ _safeExit_() {
fi fi
fi fi
if [[ -n ${TMP_DIR:-} && -d ${TMP_DIR:-} ]]; then if [[ -n ${TMP_DIR:-} && -d ${TMP_DIR:-} ]]; then
if [[ ${1:-} == 1 && -n "$(ls "${TMP_DIR}")" ]]; then if [[ ${1:-} == 1 && -n "$(ls "${TMP_DIR}")" ]]; then
command rm -r "${TMP_DIR}" command rm -r "${TMP_DIR}"
else else