From 8b349cd89eab4003eb558e98d2bde7bb95e71f4a Mon Sep 17 00:00:00 2001
From: Brendan Taylor <whateley@gmail.com>
Date: Sun, 21 Nov 2010 22:41:29 -0700
Subject: uzbl-browser: add UZBL_COOKIE_DAEMON and UZBL_EVENT_MANAGER variables

---
 src/uzbl-browser | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/uzbl-browser b/src/uzbl-browser
index 6cd7b54..1b7abe7 100755
--- a/src/uzbl-browser
+++ b/src/uzbl-browser
@@ -52,18 +52,19 @@ then
 	fi
 fi
 
-# uzbl-cookie-manager will exit if another instance is already running
-uzbl-cookie-manager
-
-DAEMON_SOCKET=$XDG_CACHE_HOME/uzbl/event_daemon
-DAEMON_PID=${DAEMON_SOCKET}.pid
+# uzbl-cookie-manager will exit if another instance is already running.
+# we could also check if its pid file exists to avoid having to spawn it.
+#if [ ! -f "$XDG_CACHE_HOME"/uzbl/cookie_daemon_socket.pid ]
+#then
+	${UZBL_COOKIE_DAEMON:-uzbl-cookie-manager}
+#fi
 
-# uzbl-event-manager will exit if one is already running, but you could
-# check if the pid file exists here to avoid having to spawn it for a
-# slight speedup
-#if [ -f "$DAEMON_PID" ]
+# uzbl-event-manager will exit if one is already running.
+# we could also check if its pid file exists to avoid having to spawn it.
+DAEMON_SOCKET="$XDG_CACHE_HOME"/uzbl/event_daemon
+#if [ ! -f "$DAEMON_SOCKET".pid ]
 #then
-	uzbl-event-manager -va start
+	${UZBL_EVENT_MANAGER:-uzbl-event-manager -va start}
 #fi
 
 exec uzbl-core "$@" $config --connect-socket $DAEMON_SOCKET
-- 
cgit v1.2.3