Merge branch 'master' of https://github.com/HelloZeroNet/ZeroNet

HelloZeroNet · May 23, 2017 · fb43dfb · fb43dfb
2 parents 6dc084c + b028eee
commit fb43dfb
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Debug/DebugMedia.py b/src/Debug/DebugMedia.py
@@ -85,7 +85,7 @@ def merge(merged_path):
                     return False  # No coffeescript compiler, skip this file
 
                 # Replace / with os separators and escape it
-                file_path_escaped = helper.shellquote(os.path.join(*file_path.split("/")))
+                file_path_escaped = helper.shellquote(file_path.replace(os.path.sep, "/"))
 
                 if "%s" in config.coffeescript_compiler:  # Replace %s with coffeescript file
                     command = config.coffeescript_compiler % file_path_escaped