Merge pull request #942 from grez911/master

fix issue #936
This commit is contained in:
ZeroNet 2017-05-23 00:03:37 +02:00 committed by GitHub
commit b028eee90e

View file

@ -85,7 +85,7 @@ def merge(merged_path):
return False # No coffeescript compiler, skip this file return False # No coffeescript compiler, skip this file
# Replace / with os separators and escape it # 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 if "%s" in config.coffeescript_compiler: # Replace %s with coffeescript file
command = config.coffeescript_compiler % file_path_escaped command = config.coffeescript_compiler % file_path_escaped