summaryrefslogtreecommitdiff
path: root/apps/couch
diff options
context:
space:
mode:
authorAdam Kocoloski <adam@cloudant.com>2010-08-27 23:29:13 -0400
committerAdam Kocoloski <adam@cloudant.com>2010-08-27 23:29:20 -0400
commitc11a92e53306f54071ed1a561e3a90ce9b2dad04 (patch)
tree432eaa4763d267cb58b2f061a0d59e550a25760e /apps/couch
parent342b04f23ed625acb147bc628df641601ea8fbe7 (diff)
use couchspawnkillable from privdir instead of overlay
Diffstat (limited to 'apps/couch')
-rwxr-xr-x[-rw-r--r--]apps/couch/priv/couchspawnkillable.sh0
-rw-r--r--apps/couch/src/couch_os_process.erl2
2 files changed, 1 insertions, 1 deletions
diff --git a/apps/couch/priv/couchspawnkillable.sh b/apps/couch/priv/couchspawnkillable.sh
index f8d042e3..f8d042e3 100644..100755
--- a/apps/couch/priv/couchspawnkillable.sh
+++ b/apps/couch/priv/couchspawnkillable.sh
diff --git a/apps/couch/src/couch_os_process.erl b/apps/couch/src/couch_os_process.erl
index 1fe38e8e..7fe8aa89 100644
--- a/apps/couch/src/couch_os_process.erl
+++ b/apps/couch/src/couch_os_process.erl
@@ -104,7 +104,7 @@ readjson(#os_proc{} = OsProc) ->
% gen_server API
init([Command, Options, PortOptions]) ->
- Spawnkiller = filename:join([code:root_dir(), "bin", "couchspawnkillable"]),
+ Spawnkiller = filename:join([code:priv_dir(couch), "couchspawnkillable.sh"]),
BaseProc = #os_proc{
command=Command,
port=open_port({spawn, Spawnkiller ++ " " ++ Command}, PortOptions),