Minor improvements

micro5k · Aug 9, 2023 · 5741082 · 5741082
1 parent f2364b2
commit 5741082
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml
@@ -47,7 +47,16 @@ jobs:
           echo '==============='
           echo 'RECOVERY OUTPUT'
           echo '==============='
-          cat "${workspace_path:?}/recovery-simulator/output/recovery-output.log"
+          if test -e "${workspace_path:?}/recovery-simulator/output/recovery-output.log"; then
+            cat "${workspace_path:?}/recovery-simulator/output/recovery-output.log"
+          fi
+          printf '\n\n'
+          echo '==============='
+          echo 'INSTALLED FILES'
+          echo '==============='
+          if test -e "${workspace_path:?}/recovery-simulator/output/installed-files.log"; then
+            cat "${workspace_path:?}/recovery-simulator/output/installed-files.log"
+          fi
       - name: "SHA256"
         if: "${{ github.event_name != 'pull_request' }}"
         run: |

diff --git a/recovery-simulator/recovery.sh b/recovery-simulator/recovery.sh
@@ -346,9 +346,6 @@ if test "${uname_o_saved:?}" != 'MS/Windows' && test "${uname_o_saved:?}" != 'Ms
   sudo chattr -a "${recovery_logs_dir:?}/recovery-stderr.log" || fail_with_msg "chattr failed on 'recovery-stderr.log'"
 fi
 
-# List installed files
-#ls -ARFl --color=always -- "${BASE_SIMULATION_PATH}" || true
-
 parse_recovery_output()
 {
   _last_zip_name=''
@@ -372,8 +369,12 @@ parse_recovery_output()
 }
 
 # Parse recovery output
-parse_recovery_output true "${recovery_logs_dir}/recovery-output-raw.log" "${recovery_logs_dir}/recovery-output.log"
-parse_recovery_output false "${recovery_logs_dir}/recovery-raw.log" "${recovery_logs_dir}/recovery.log"
+parse_recovery_output true "${recovery_logs_dir:?}/recovery-output-raw.log" "${recovery_logs_dir:?}/recovery-output.log"
+parse_recovery_output false "${recovery_logs_dir:?}/recovery-raw.log" "${recovery_logs_dir:?}/recovery.log"
+
+# List installed files
+rm -rf -- "${_android_sys:?}/bin" # It contains all symlinks of BusyBox, so remove it for now
+ls -A -R -F -l -n --color='never' -- "${BASE_SIMULATION_PATH}" 1> "${recovery_logs_dir:?}/installed-files.log" || true
 
 # Final cleanup
 cd "${_init_dir:?}" || fail_with_msg 'Failed to change back the folder'