]> jfr.im git - irc/rizon/qchat.git/commitdiff
fix path annoyances on windows
authorChris Porter <redacted>
Mon, 18 Aug 2014 00:05:52 +0000 (01:05 +0100)
committerChris Porter <redacted>
Mon, 18 Aug 2014 00:05:52 +0000 (01:05 +0100)
bin/compile.py
bin/dependencies_b.py
bin/pagegen.py

index 7bad5490450547d5e5ad45b7cc458a4d5a49c4e3..f037e93532fc02d916455827adfac548c491d787 100644 (file)
@@ -11,7 +11,7 @@ class MinifyException(Exception):
   
 def jarit(src):
   try:
-    p = subprocess.Popen(["java", "-jar", "bin/yuicompressor-2.4.8.jar", src], stdout=subprocess.PIPE)
+    p = subprocess.Popen(["java", "-jar", "bin/yuicompressor-2.4.8.jar", src], stdout=subprocess.PIPE, shell=os.name == "nt")
   except Exception, e:
     if hasattr(e, "errno") and e.errno == 2:
       raise MinifyException, "unable to run java"
index 89fbd5f38e76eb41560654fb5eda2044dabbc8fe..66a26de7e827e5603f10435cbc02a0305e63d767 100644 (file)
@@ -45,7 +45,7 @@ def check_java():
     warn(specific, "java is not required, but allows qwebirc to compress output,", "making it faster to download.", "you can get java at http://www.java.com/")\r
     \r
   try:\r
-    p = subprocess.Popen(["java", "-version"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)\r
+    p = subprocess.Popen(["java", "-version"], stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=os.name == "nt")\r
     p.communicate()\r
     if p.wait() != 0:\r
       java_warn("something went wrong looking for java.")\r
@@ -61,7 +61,7 @@ def check_hg():
     warn(specific, "mercurial (hg) is not required, but allows qwebirc to save bandwidth by versioning.", "you can get hg at http://www.selenic.com/mercurial/")\r
     \r
   try:\r
-    p = subprocess.Popen(["hg", "id"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)\r
+    p = subprocess.Popen(["hg", "id"], stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=os.name == "nt")\r
     p.communicate()\r
     if p.wait() != 0:\r
       hg_warn("something went wrong looking for mercurial.")\r
index 6dc20604c5fb4478d1dda11b3105f6444d57ef33..311d95f9d32bd7ab0031ffd7602e415209e18840 100755 (executable)
@@ -27,7 +27,7 @@ def csslist(name, debug, gen=False):
 
 def _gethgid():
   try:
-    p = subprocess.Popen(["hg", "id"], stdout=subprocess.PIPE)
+    p = subprocess.Popen(["hg", "id"], stdout=subprocess.PIPE, shell=os.name == "nt")
   except Exception, e:
     if hasattr(e, "errno") and e.errno == 2:
       raise HGException, "unable to execute"