Reworking usage of QUIET

diff --git a/bin/manual-backup b/bin/manual-backup
index 5fa3e0b13166dabad67ea6b072d8a8e960f631c6..db45507530e0d1d5b7ae938469c6c5fc2d41e7fc 100755 (executable)
--- a/bin/manual-backup
+++ b/bin/manual-backup
@@ -602,7 +602,7 @@ sync_to_remote() {
             cmd+=" --verbose"
         fi
         cmd+=" \"${BACKUP_HOSTDIR}\" \"${rhost}:${BACKUP_PARENTDIR}\""
-        if [[ "${QUIET}" == "y" ]] ; then
+        if [[ "${QUIET}" ]] ; then
             cmd+=" >> \"${LOGFILE}\" 2>&1"
         else
             cmd+=" 2>&1 | tee -a \"${LOGFILE}\""

diff --git a/bin/update-minecraft-server-jar b/bin/update-minecraft-server-jar
index 7a8f0065792a6b72c6d19184a934582ea7afa813..bea0fdbe1e6f83d7d670cc80769a957ea49ba640 100755 (executable)
--- a/bin/update-minecraft-server-jar
+++ b/bin/update-minecraft-server-jar
@@ -371,7 +371,7 @@ restart_service() {
         empty_line
         info "Status of '${CYAN}${service}${NORMAL}':"
         svc_status=$( systemctl status "${service}" 2>&1 )
-        if [[ "${QUIET}" != "y" ]] ; then
+        if [[ -z "${QUIET}" ]] ; then
             echo "${svc_status}"
         fi
         MAIL_BODY+="\n$( my_date ): Status of service '${service}':\n${svc_status}\n"

diff --git a/lib/functions.rc b/lib/functions.rc
index 879f8391a3ef12f7845f2d98691696f94b75008d..7ac1efe15729bbd7a70b86a10ba1c3ce16ddb284 100644 (file)
--- a/lib/functions.rc
+++ b/lib/functions.rc
@@ -32,7 +32,7 @@ VERBOSE=""
 DEBUG=""
 DO_ASK=""
 SIMULATE=""
-QUIET="n"
+QUIET=""
 
 LOGFILE=
 
@@ -184,7 +184,7 @@ eval_common_options() {
         done
     fi
 
-    if [[ "${VERBOSE}" && "${QUIET}" == "y" ]] ; then
+    if [[ "${VERBOSE}" && "${QUIET}" ]] ; then
         error "The options '${RED}--verbose${NORMAL}' and '${RED}--quiet${NORMAL}' are mutually exclusive."
         echo
         usage >&2
@@ -299,7 +299,7 @@ info() {
     if [[ -n "${LOGFILE}" ]] ; then
         echo -e "[${ts}] [${BASE_NAME}:${GREEN}INFO${NORMAL}] : $@" >>"${LOGFILE}"
     fi
-    if [[ "${QUIET}" != "y" ]] ; then
+    if [[ -z "${QUIET}" ]] ; then
         echo -e " ${GREEN}*${NORMAL} [${ts}] [${BASE_NAME}:${GREEN}INFO${NORMAL}] : $@" >&2
     fi
 }
@@ -347,7 +347,7 @@ line() {
         echo "${l}" >>"${LOGFILE}"
     fi
 
-    if [[ "${QUIET}" == "y" ]] ; then
+    if [[ "${QUIET}" ]] ; then
         return
     fi
     echo "${l}"
@@ -366,7 +366,7 @@ empty_line() {
         echo >>"${LOGFILE}"
     fi
 
-    if [[ "${QUIET}" == "y" ]] ; then
+    if [[ "${QUIET}" ]] ; then
         return
     fi
     echo