Merge pull request #56 from matxpa/main

Update HCBootloader.swift Fix Clover Bootloader info with Old Clover …
0xCUB3 · Oct 7, 2023 · de1c9db · de1c9db
2 parents 7aa741b + 57a9781
commit de1c9db
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/About This Hack/HardwareCollectors/HCBootloader.swift b/About This Hack/HardwareCollectors/HCBootloader.swift
@@ -13,7 +13,8 @@ class HCBootloader {
                 BootloaderInfo = run("echo \"OpenCore \"$(nvram " + initGlobVar.nvramOpencoreVersion + " | awk '{print $2}' | awk -F'-' '{print $2}' | sed -e 's/ */./g' -e s'/^.//g' -e 's/.$//g' -e 's/ .//g' -e 's/. //g' | tr -d '\n') $( nvram " + initGlobVar.nvramOpencoreVersion + " | awk '{print $2}' | awk -F'-' '{print $1}' | sed -e 's/REL/(Release)/g' -e s'/N\\/A//g' -e 's/DEB/(Debug)/g' | tr -d '\n')")
             }
         else {
-            BootloaderInfo = run("grep \"Clover\" " + initGlobVar.hwFilePath + " | awk '{print $4,\"r\" $6,\"(\" substr($9,1,7) \") \"}' | tr -d '\n'")
+//            BootloaderInfo = run("grep \"Clover\" " + initGlobVar.hwFilePath + " | awk '{print $4,\"r\" $6,\"(\" substr($9,1,7) \") \"}' | tr -d '\n'")
+            BootloaderInfo = run(initGlobVar.bdmesgExecID + " | grep -i \"Starting Clover revision:\" | awk -F 'Starting Clover revision:' '{print $NF}'  | awk '{print \"Clover r\"$1\" (\"substr($4,1,7)\") \"}' | tr -d '\n'")
             if BootloaderInfo  != "" {
                 BootloaderInfo += run("echo $(" + initGlobVar.bdmesgExecID + " | grep -i \"Build with: \\[Args:\" | awk -F '\\-b' '{print $NF}' |  awk -F '\\-t' '{print $1,$2}' |  awk '{print toupper(substr($2,0,1))tolower(substr($2,2)),toupper(substr($1,0,1))tolower(substr($1,2))}') $(" + initGlobVar.bdmesgExecID + " | grep -i \"Build id:\" | awk -F 'Build id:' '{print $NF}' | awk -F '-' '{print  substr($1,1,5)\"/\"substr($1,6,2)\"/\"substr($1,8,2)\" \"substr($1,10,2)\":\"substr($1,12,2)\":\"substr($1,14,2)}'  | tr -d '\n')")
             }