smoother output on Xprivacy export

- keeping file size updates on the same line (overwrite)
- only has effect in log level 4+

Author: IzzySoft

adebar-cli

@@ -232,17 +232,22 @@ declare -a dApps
 
 #########################################[ Helpers ]###
 # Log progress (if enabled)
-# Call: doProgress "what to show" [level]"
-# level defaults to 1
+# Call: doProgress "what to show" [level [eparm]]"
+# level defaults to 1; eparm has optional additional params to echo
 doProgress() {
   [[ $PROGRESS -eq 0 ]] && return
   if [[ -z "$2" ]]; then
     local level=1
   else
     local level=$2
   fi
+  if [[ -n "$3" ]]; then
+    local eparm="-e${3}"
+  else
+    local eparm="-e"
+  fi
   if [[ $PROGRESS -ge $level ]]; then
-    echo -e "$1"
+    echo ${eparm} "$1"
   fi
 }
 

lib/pull_config.lib

@@ -88,7 +88,7 @@ getXPrivacy() {
     local -i sleepcount=0
     local -i oldsize=0
     local -i newsize=0
-    local newsizestr
+    local newsizestr nobreak=0
     doProgress "- waiting for XPrivacy export to complete" 2
     while [[ $sleepcount -lt 10 ]] # 20s should be sufficient, else something went wrong
     do
@@ -98,19 +98,24 @@ getXPrivacy() {
         newsize=(${newsizestr//[$'\r']})
         if [[ $newsize -eq 0 ]]; then
           sleepcount+=1
-          doProgress "  + export started, file still empty" 4
+          doProgress "  + export started, file still empty\r" 4 n
+          nobreak=1
         elif [[ $newsize -eq $oldsize ]]; then  # not growing anymore
           doProgress "  + export seems complete, final size: ${newsize} bytes" 4
+          nobreak=0
           break
         else
           oldsize=$newsize
-          doProgress "  + export running, current size: ${newsize} bytes" 4
+          doProgress "  + export running, current size: ${newsize} bytes\r" 4 n
+          nobreak=1
         fi
       else
         sleepcount+=1
-        doProgress "  + Loop ${sleepcount}, file not yet there" 4
+        doProgress "  + Loop ${sleepcount}, file not yet there\r" 4 n
+        nobreak=1
       fi
     done
+    [[ $nobreak -ne 0 ]] && doProgress "" 4
     if [[ -n "$(adb ${ADBOPTS} shell ls ${filename%/*}/ | grep ${filename##*/})" ]]; then
       sleep 2 # just another safeguard to ensure export is complete
       local msg="$((adb ${ADBOPTS} pull ${filename} "${CONFDIR}/xprivacy.xml") 2>&1)"