Allow logging to be disabled temporarily by functions

Author: sysrich

usr/bin/tik

@@ -17,6 +17,7 @@ tik_module="tik"
 
 # Start logging
 exec 2> >(exec tee -i -a "${tik_log}" >&2)
+logging=true
 log "[START] $0"
 
 # Check for debug mode

usr/lib/tik/lib/tik-functions

@@ -5,7 +5,9 @@
 . /usr/lib/tik/lib/cenity
 
 log(){
-    echo "[${tik_module}][$(date +"%Y%m%d-%T")][LOG] $*" 1>&2
+    if $logging; then
+        echo "[${tik_module}][$(date +"%Y%m%d-%T")][LOG] $*" 1>&2
+    fi
 }
 
 warn() {
@@ -49,10 +51,11 @@ d_opt(){
     retval=0
     if $gui; then
         result="$(zenity "$@")" || retval=$?
+        log "[zenity][${retval}][${result}] $@"
     else
         cenity result "$@" || retval=$?
+        log "[cenity][${retval}][${result}] $@"
     fi
-    log "[zenity][${retval}][${result}] $@"
     return $retval
 }
 

usr/lib/tik/modules/post/15-encrypt

@@ -184,7 +184,9 @@ display_recoveryKey() {
     [ "${tik_encrypt_mode}" == 0 ] && message=${defaultmsg}
     [ "${tik_encrypt_mode}" == 1 ] && message=${fallbackmsg}
     log "[display_recoveryKey] displaying recovery key"
+    logging=false
     d --width=500 --height=500 --no-wrap --warning --icon=security-high-symbolic --title="Encryption Recovery Key" --text="${message}You may optionally scan the recovery key off screen:\n<span face='monospace'>$(qrencode ${key} -t UTF8i)</span>\nFor more information please visit <tt>https://aeondesktop.org/encrypt</tt>"
+    logging=true
     log "[display_recoveryKey] recovery key dialogue dismissed"
 }
 
@@ -193,6 +195,7 @@ add_key() {
         d --width=500 --height=300 --no-wrap --warning --icon=security-high-symbolic --title="Set Encryption Passphrase" --text="This ${TIK_OS_NAME} system is encrypted and will require a Passphrase on every boot\n\nYou will be prompted to set the Passphrase on the next screen\n\nFor more information please visit <tt>https://aeondesktop.org/encrypt</tt>"
         log "[add_key] Fallback Mode - Prompting user for passphrase for ${cryptpart}"
         # Not using 'd' function to avoid logging the password
+        # FIXME - Now use 'd' function and logging=false
         while true
         do
             if $gui; then