improve: replace loop with a wildcard search and grep exclusion instead of if statements

* This simplifies the complexity of both action.sh and post-fs-data.sh while retaining identical behaviour

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

Author: TheSillyOk

action.sh

@@ -11,19 +11,7 @@ mkdir -p "$SAVE_FOLDER"
 echo "Selecting the latest debug log file..."
 echo ""
 
-index=0
-for f in "$SAVE_FOLDER"/*; do
-  index=$((index + 1))
-  LATEST=$(ls -t "$SAVE_FOLDER" | awk NR==$index)
-  if [[ "$LATEST" == "" ]]; then
-    break
-  fi
-  if [[ "$LATEST" != "DebugAssistant-Redacted.log" && "$LATEST" == "DebugAssistant"* ]]; then
-    break
-  fi
-  LATEST=""
-done
-
+LATEST=$(basename $(ls -t "$SAVE_FOLDER"/DebugAssistant* | grep -v "-Redacted" | head -n 1))
 if [[ "$LATEST" == "" ]]; then
   echo "No debug log found."
   exit 1
@@ -32,9 +20,6 @@ fi
 echo "Latest debug log selected: $LATEST"
 
 NEW_LOG="$SAVE_FOLDER/DebugAssistant-Redacted.log"
-if [ -f "$NEW_LOG" ]; then
-  rm "$NEW_LOG"
-fi
 
 echo ""
 echo "Redacting sensitive information..."
@@ -78,5 +63,5 @@ echo ""
 echo "Redacted logs in $NEW_LOG"
 echo ""
 
-echo "Copied redacted log to /sdcard/Download..."
 cp "$NEW_LOG" /sdcard/Download
+echo "Copied redacted log to /sdcard/Download..."

post-fs-data.sh

@@ -21,29 +21,15 @@ function watch_logcat() {
   while [ ! ];do logcat;sleep 1;done > "$file_path" &
 }
 
-FILES=$(ls "$SAVE_FOLDER" | grep 'DebugAssistant')
-if [[ "$FILES" != "" ]]; then
-  index=1
-  for f in "$SAVE_FOLDER"/*; do
-    LATEST=$(ls -t "$SAVE_FOLDER" | awk NR==$index)
-    if [[ "$LATEST" == "DebugAssistant.log" ]]; then
-      prepare_file "-2"
-      watch_logcat "-2"
-      break
-    fi
-    if [[ "$LATEST" == "DebugAssistant-2.log" ]]; then
-      prepare_file "-3"
-      watch_logcat "-3"
-      break
-    fi
-    if [[ "$LATEST" == "DebugAssistant-3.log" ]]; then
-      prepare_file ""
-      watch_logcat ""
-      break
-    fi
-    index=$((index + 1))
-  done
+
+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"
 else
-  prepare_file ""
-  watch_logcat ""
+  SUFFIX=""
 fi
+
+prepare_file "$SUFFIX"
+watch_logcat "$SUFFIX"