add: dmesg logging; improve: make logs based on extracted suffix for dmesg pairing with logcats on action.sh

This commit uses grep -oE to extract the log suffix "-2" (action.sh) or "2" (post-fs-data.sh)
it allows the new dmesg logs to be paired with the corresponding log on the action script
and also allow a simplification on post-fs-data.sh by checking if the last log is not the last before returning to the starting log (3) and if the initial log is existent to add 1 to the last log which defaults to 2 (1+1) if it doesn't contain a suffix (first log)
while if the starting log is non existent or the last log was the finishing one before looping back (3) it will use no suffix to create the starting log

Signed-off-by: TheSillyOk <priv.ld@proton.me>

Author: TheSillyOk

action.sh

@@ -13,16 +13,18 @@ mkdir -p "$SAVE_FOLDER"
 
 log "Selecting the latest debug log file..."
 
-LATEST=$(ls -t "$SAVE_FOLDER"/DebugAssistant* | grep -v "-Redacted" | head -n 1)
-if [[ "$LATEST" == "" ]]; then
+LATEST_SUFFIX=$(basename $(ls -t "$SAVE_FOLDER/"DebugAssistant* | grep -v "-Redacted" | head -n 1) | grep -oE "(-[0-9]+)?")
+LATEST="DebugAssistant$LATEST_SUFFIX.log"
+if [[ ! -f "$SAVE_FOLDER/$LATEST" ]]; then
   log "[!] No debug logs found. Exiting..."
   sleep 4
   exit 1
 fi
 
 NEW_LOG="$SAVE_FOLDER/DebugAssistant-Redacted.log"
+DMESG_LOG="$SAVE_FOLDER/DebugAssistant-DMESG$LATEST_SUFFIX.log"
 
-log "Latest debug log selected: $(basename $LATEST)"
+log "Latest debug log selected: $LATEST"
 
 log "Redacting sensitive information..."
 
@@ -59,9 +61,11 @@ sed -E                                                                   \
                                                                          \
                                                                          \
                                                                          \
-  "$LATEST" > "$NEW_LOG"
+  "$SAVE_FOLDER/$LATEST" > "$NEW_LOG"
 
 log "Redacted logs in $NEW_LOG"
 
 cp "$NEW_LOG" /sdcard/Download
-log "Copied redacted log to /sdcard/Download..."
+cp "$DMESG_LOG" /sdcard/Download
+log "Copied redacted log and matching dmesg to /sdcard/Download..."
+sleep 3

post-fs-data.sh

@@ -3,33 +3,47 @@
 # A tool to collect extremely verbose debug log from the Android system.
 # LICENSE: BSD 3-Clause by ThePedroo
 
-SAVE_FOLDER=/data/local/tmp/DebugAssistant
-
+SAVE_FOLDER="/data/local/tmp/DebugAssistant"
 mkdir -p "$SAVE_FOLDER"
 
-function prepare_file() {
+start_log() {
+  local suffix="$1"
+
+  watch_logcat "$suffix"
+  watch_dmesg "$suffix"
+}
+
+prepare_file() {
   local file_path="$1"
 
   rm "$file_path"
   touch "$file_path"
   chown shell:shell "$file_path"
 }
 
-function watch_logcat() {
+watch_logcat() {
   local file_path="$SAVE_FOLDER/DebugAssistant$1.log"
   prepare_file "$file_path"
 
   while [ ! ];do logcat;sleep 1;done > "$file_path" &
 }
 
+watch_dmesg() {
+  local file_path="$SAVE_FOLDER/DebugAssistant-DMESG$1.log"
+  prepare_file "$file_path"
+
+  if dmesg --help 2>&1 | grep -q "\-w"; then
+    dmesg -w > "$file_path" &
+  else
+    while [ ! ];do dmesg > "$file_path";sleep 1;done &
+  fi
+}
 
-LATEST=$(basename $(ls -t "$SAVE_FOLDER"/DebugAssistant*.log | grep -v "Redacted" | head -n 1))
-if [[ "$LATEST" == "DebugAssistant.log" ]]; then
-  SUFFIX="-2"
-elif [[ "$LATEST" == "DebugAssistant-2.log" ]]; then
-  SUFFIX="-3"
+LATEST_SUFFIX=$(basename $(ls -t "$SAVE_FOLDER"/DebugAssistant*.log | grep -v "Redacted" | head -n 1) | grep -oE "([0-9]+)?")
+if [[ -f "$SAVE_FOLDER/DebugAssistant.log" && "$LATEST_SUFFIX" != "3" ]]; then
+  SUFFIX="-$(( ${LATEST_SUFFIX:-1} + 1 ))"
 else
   SUFFIX=""
 fi
 
-watch_logcat "$SUFFIX"
+start_log "$SUFFIX"