From 944dbcd5af0f47363499c55effb85170357b77db Mon Sep 17 00:00:00 2001
From: Adam Kocoloski <kocolosk@apache.org>
Date: Sat, 24 Oct 2009 18:53:57 +0000
Subject: use couch_util:priv_dir() b/c it works in dev mode too

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@829432 13f79535-47bb-0310-9956-ffa450edef68
---
 src/couchdb/couch_os_process.erl | 8 +-------
 src/couchdb/couch_server_sup.erl | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'src/couchdb')

diff --git a/src/couchdb/couch_os_process.erl b/src/couchdb/couch_os_process.erl
index 957e1a95..f42e99a8 100644
--- a/src/couchdb/couch_os_process.erl
+++ b/src/couchdb/couch_os_process.erl
@@ -103,13 +103,7 @@ readjson(OsProc) when is_record(OsProc, os_proc) ->
 
 % gen_server API
 init([Command, Options, PortOptions]) ->
-    case code:priv_dir(couch) of
-    {error, bad_name} ->
-        % small hack, in dev mode "app" is couchdb. Fixing requires renaming
-        % src/couch to src/couch. Not really worth the hassle.-Damien
-        PrivDir = code:priv_dir(couchdb);
-    PrivDir -> ok
-    end,
+    PrivDir = couch_util:priv_dir(),
     Spawnkiller = filename:join(PrivDir, "couchspawnkillable"),
     BaseProc = #os_proc{
         command=Command,
diff --git a/src/couchdb/couch_server_sup.erl b/src/couchdb/couch_server_sup.erl
index 989b0007..d89e987d 100644
--- a/src/couchdb/couch_server_sup.erl
+++ b/src/couchdb/couch_server_sup.erl
@@ -76,7 +76,7 @@ start_server(IniFiles) ->
     LibDir =
     case couch_config:get("couchdb", "util_driver_dir", null) of
     null ->
-        filename:join(code:priv_dir(couch), "lib");
+        filename:join(couch_util:priv_dir(), "lib");
     LibDir0 -> LibDir0
     end,
 
-- 
cgit v1.2.3