summaryrefslogtreecommitdiff
path: root/dev
diff options
context:
space:
mode:
authorPaul J. Davis <paul.joseph.davis@gmail.com>2014-02-06 17:28:54 -0600
committerPaul J. Davis <paul.joseph.davis@gmail.com>2014-02-06 21:09:31 -0600
commit5c1dfb7af1f109b176624cee46fa3f002b89dd8c (patch)
tree586af96467fee10e23fb30fa33b4d63d6fbf8027 /dev
parent3688eab9d4c6ab673be753a4641ce97e85014d27 (diff)
downloadcouchdb-5c1dfb7af1f109b176624cee46fa3f002b89dd8c.tar.gz
Enable coffescript on dev/run nodes
Diffstat (limited to 'dev')
-rwxr-xr-xdev/run10
1 files changed, 9 insertions, 1 deletions
diff --git a/dev/run b/dev/run
index 1e40eb141..fc7647645 100755
--- a/dev/run
+++ b/dev/run
@@ -62,9 +62,14 @@ def hack_default_ini(opts, node, args, contents):
# Replace couchjs command
couchjs = os.path.join(COUCHDB, "src", "couch", "priv", "couchjs")
mainjs = os.path.join(COUCHDB, "share", "server", "main.js")
+ coffeejs = os.path.join(COUCHDB, "share", "server", "main-coffee.js")
+
repl = "javascript = %s %s" % (couchjs, mainjs)
contents = re.sub("(?m)^javascript.*$", repl, contents)
+ repl = "coffeescript = %s %s" % (couchjs, coffeejs)
+ contents = re.sub("(?m)^coffeescript.*$", repl, contents)
+
return contents
@@ -203,7 +208,10 @@ def reboot_nodes():
def run_command(cmd):
p = sp.Popen(cmd, shell=True, stdout=sp.PIPE, stderr=sys.stderr)
- for line in p.stdout:
+ while True:
+ line = p.stdout.readline()
+ if not line:
+ break
try:
eval(line)
except: