Enable coffescript on dev/run nodes

2 files changed, 11 insertions, 2 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:
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index be1745db7..f40619ffd 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -41,7 +41,8 @@ timeout = 600 ; number of seconds before automatic logout
 auth_cache_size = 50 ; size is number of cache entries
 
 [query_servers]
-javascript = {{prefix}}/bin/couchjs {{prefix}}/share/couchjs/main.js
+javascript = {{prefix}}/bin/couchjs {{prefix}}/share/server/main.js
+coffeescript = {{prefix}}/bin/couchjs {{prefix}}/share/server/main-coffee.js
 
 [query_server_config]
 reduce_limit = true