fix: handle whitespaces in paths

linkedin · Aug 9, 2019 · 84e9071 · 84e9071
1 parent ba1b265
commit 84e9071
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/qark/decompiler/decompiler.py b/qark/decompiler/decompiler.py
@@ -26,9 +26,9 @@
 
 DECOMPILERS_PATH = os.path.join(LIB_PATH, "decompilers")
 
-APK_TOOL_COMMAND = ("java -Djava.awt.headless=true -jar {apktool_path}/apktool.jar "
-                    "d {path_to_source} --no-src --force -m --output {build_directory}")
-DEX2JAR_COMMAND = "{dex2jar_path} {path_to_dex} -o {build_apk}.jar"
+APK_TOOL_COMMAND = ("java -Djava.awt.headless=true -jar '{apktool_path}/apktool.jar' "
+                    "d '{path_to_source}' --no-src --force -m --output '{build_directory}'")
+DEX2JAR_COMMAND = "'{dex2jar_path}' '{path_to_dex}' -o '{build_apk}.jar'"
 
 
 def escape_windows_path(path):

diff --git a/qark/decompiler/external_decompiler.py b/qark/decompiler/external_decompiler.py
@@ -19,7 +19,7 @@ def __init__(self):
         ExternalDecompiler.__init__(self,
                                     name="cfr",
                                     path_to_decompiler=os.path.join(PATH_TO_DECOMPILERS, "cfr_0_124.jar"),
-                                    command="java -jar {path_to_decompiler} {jar} --outputdir {build_directory}/cfr")
+                                    command="java -jar '{path_to_decompiler}' '{jar}' --outputdir '{build_directory}/cfr'")
 
 
 class Procyon(ExternalDecompiler):
@@ -28,7 +28,7 @@ def __init__(self):
                                     name="procyon",
                                     path_to_decompiler=os.path.join(PATH_TO_DECOMPILERS,
                                                                     "procyon-decompiler-1.0.jar"),
-                                    command="java -jar {path_to_decompiler} {jar} -o {build_directory}/procyon")
+                                    command="java -jar '{path_to_decompiler}' '{jar}' -o '{build_directory}/procyon'")
 
 
 class Fernflower(ExternalDecompiler):
@@ -37,7 +37,7 @@ def __init__(self):
                                     name="fernflower",
                                     path_to_decompiler=os.path.join(PATH_TO_DECOMPILERS,
                                                                     "fernflower.jar"),
-                                    command="java -jar {path_to_decompiler} -ren=1 {jar} {build_directory}/fernflower")
+                                    command="java -jar '{path_to_decompiler}' -ren=1 '{jar}' '{build_directory}/fernflower'")
 
 
 DECOMPILERS = (CFR(), Procyon(), Fernflower())