From d285a92cdebec6fa7d4cbff56aa77f3997859ee2 Mon Sep 17 00:00:00 2001
From: kotori0 <admin@0x.mk>
Date: Sat, 13 Jun 2020 21:26:58 +0800
Subject: [PATCH] Fix compile error on *nix systems

---
 dalvikdx/build.gradle | 25 +++++++++++++++++++++----
 dexmaker/build.gradle | 10 ++++++----
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/dalvikdx/build.gradle b/dalvikdx/build.gradle
index b031d497b..c31ce47ac 100644
--- a/dalvikdx/build.gradle
+++ b/dalvikdx/build.gradle
@@ -8,17 +8,34 @@ dependencies {
 sourceCompatibility = "7"
 targetCompatibility = "7"
 
+task findDx {
+    if (OperatingSystem.current().isWindows()){
+        return true
+    }
+    doLast {
+        new ByteArrayOutputStream().withStream { os ->
+            exec {
+                commandLine "which", "dx"
+                standardOutput os
+            }
+            rootProject.ext.dxPath = os.toString()
+        }
+    }
+}
 
 task dexInJar(type: Jar) {
     dependsOn jar
+    dependsOn findDx
     doFirst {
         exec {
             workingDir jar.destinationDir
-            if (OperatingSystem.current().isWindows())
+            if (OperatingSystem.current().isWindows()){
                 executable "dx.bat"
-            else
-                executable "dx"
-            args "--dex", "--output", "classes.dex", "${jar.archiveName}"
+                args "--dex", "--output", "classes.dex", "${jar.archiveName}"
+            } else {
+                executable "bash"
+                args rootProject.ext.dxPath.trim(), "--dex", "--output", "classes.dex", "${jar.archiveName}"
+            }
         }
     }
     from "${jar.destinationDir}/classes.dex"
diff --git a/dexmaker/build.gradle b/dexmaker/build.gradle
index 8642d24e8..9d4bc9205 100644
--- a/dexmaker/build.gradle
+++ b/dexmaker/build.gradle
@@ -19,11 +19,13 @@ task dexInJar(type: Jar) {
     doFirst {
         exec {
             workingDir jar.destinationDir
-            if (OperatingSystem.current().isWindows())
+            if (OperatingSystem.current().isWindows()){
                 executable "dx.bat"
-            else
-                executable "dx"
-            args "--dex", "--output", "classes.dex", "${jar.archiveName}"
+                args "--dex", "--output", "classes.dex", "${jar.archiveName}"
+            } else {
+                executable "bash"
+                args rootProject.ext.dxPath.trim(), "--dex", "--output", "classes.dex", "${jar.archiveName}"
+            }
         }
     }
     from "${jar.destinationDir}/classes.dex"