Enhance module flashing error handling and capture stderr output

Author: Mahmud0808

app/src/main/java/com/drdisagree/iconify/core/utils/ModuleUtils.kt

@@ -156,11 +156,11 @@ object ModuleUtils {
         var result: Shell.Result? = null
 
         if (RootUtils.isMagiskInstalled) {
-            result = Shell.cmd("magisk --install-module $modulePath").exec()
+            result = Shell.cmd("{ magisk --install-module $modulePath ; } 2>&1").exec()
         } else if (RootUtils.isKSUInstalled) {
-            result = Shell.cmd("ksud module install $modulePath").exec()
+            result = Shell.cmd("{ ksud module install $modulePath ; } 2>&1").exec()
         } else if (RootUtils.isApatchInstalled) {
-            result = Shell.cmd("apd module install $modulePath").exec()
+            result = Shell.cmd("{ apd module install $modulePath ; } 2>&1").exec()
             setPermissionsRecursively(MODULE_DIR)
         }
 
@@ -170,7 +170,10 @@ object ModuleUtils {
             Log.i(TAG, "Successfully flashed module")
         } else {
             Log.e(TAG, "Failed to flash module")
-            throw Exception(java.lang.String.join("\n", result.out))
+            val errorOutput = result.out.takeIf { lines ->
+                lines.any { !it.isNullOrBlank() }
+            } ?: result.err
+            throw Exception(java.lang.String.join("\n", errorOutput))
         }
 
         return !result.isSuccess

app/src/main/java/com/drdisagree/iconify/core/utils/overlay/compilers/OnboardingCompiler.kt

@@ -50,7 +50,7 @@ object OnboardingCompiler {
         val command: String = getAAPT2Command(source, name)
 
         while (attempt-- != 0) {
-            result = Shell.cmd(command).exec()
+            result = Shell.cmd("{ $command ; } 2>&1").exec()
 
             if (!result.isSuccess) {
                 val keywords = listOf(
@@ -67,7 +67,7 @@ object OnboardingCompiler {
                             "find $source/res -type f -name \"*.xml\" -exec sed -i '/$keyword/d' {} +"
                         ).exec()
                     }
-                    result = Shell.cmd(command).exec()
+                    result = Shell.cmd("{ $command ; } 2>&1").exec()
                 }
             }
 
@@ -86,11 +86,13 @@ object OnboardingCompiler {
             }
         }
 
-        if (!result!!.isSuccess) writeLog(
-            "$TAG - AAPT",
-            "Failed to build APK for $name",
-            result.out
-        )
+        if (!result!!.isSuccess) {
+            val errorOutput = result.out.takeIf { lines ->
+                lines.any { !it.isNullOrBlank() }
+            } ?: result.err
+
+            writeLog("$TAG - AAPT", "Failed to build APK for $name", errorOutput)
+        }
 
         return !result.isSuccess
     }
@@ -113,7 +115,7 @@ object OnboardingCompiler {
         while (attempt-- != 0) {
             result =
                 Shell.cmd(
-                    "$zipalign -p -f 4 $source $UNSIGNED_DIR/$name"
+                    "{ $zipalign -p -f 4 $source $UNSIGNED_DIR/$name ; } 2>&1"
                 ).exec()
 
             if (result.isSuccess) {
@@ -139,11 +141,17 @@ object OnboardingCompiler {
             }
         }
 
-        if (!result!!.isSuccess) writeLog(
-            "$TAG - ZipAlign",
-            "Failed to zip align " + name.replace("-unsigned.apk", ""),
-            result.out
-        )
+        if (!result!!.isSuccess) {
+            val errorOutput = result.out.takeIf { lines ->
+                lines.any { !it.isNullOrBlank() }
+            } ?: result.err
+
+            writeLog(
+                "$TAG - ZipAlign",
+                "Failed to zip align " + name.replace("-unsigned.apk", ""),
+                errorOutput
+            )
+        }
 
         return !result.isSuccess
     }

app/src/main/java/com/drdisagree/iconify/core/utils/overlay/compilers/OverlayCompiler.kt

@@ -121,18 +121,22 @@ object OverlayCompiler {
         val result =
             Shell.cmd(
                 "rm -rf $UNSIGNED_DIR/$fileName-unsigned.apk",
-                "$zipalign 4 $source $UNSIGNED_DIR/$fileName-unsigned.apk"
+                "{ $zipalign 4 $source $UNSIGNED_DIR/$fileName-unsigned.apk ; } 2>&1"
             ).exec()
 
         if (result.isSuccess) Log.i(
             "$TAG - ZipAlign",
             "Successfully zip aligned $fileName"
         ) else {
+            val errorOutput = result.out.takeIf { lines ->
+                lines.any { !it.isNullOrBlank() }
+            } ?: result.err
+
             Log.e(
                 "$TAG - ZipAlign",
-                "Failed to zip align $fileName\n${java.lang.String.join("\n", result.out)}"
+                "Failed to zip align $fileName\n${errorOutput.joinToString("\n")}"
             )
-            writeLog("$TAG - ZipAlign", "Failed to zip align $fileName", result.out)
+            writeLog("$TAG - ZipAlign", "Failed to zip align $fileName", errorOutput)
         }
 
         return !result.isSuccess