diff options
| -rw-r--r-- | Makefile | 5 | ||||
| -rwxr-xr-x | examples/data/uzbl/scripts/uzbl-cookie-daemon | 8 | ||||
| -rwxr-xr-x | examples/data/uzbl/scripts/uzbl-event-manager | 8 | ||||
| -rwxr-xr-x | sandbox/env.sh | 10 |
4 files changed, 16 insertions, 15 deletions
@@ -62,13 +62,13 @@ test-uzbl-browser: uzbl-browser ./uzbl-browser --uri http://www.uzbl.org --verbose test-uzbl-core-sandbox: uzbl-core - make DESTDIR=./sandbox RUN_PREFIX=`pwd`/sandbox/usr/local install-uzbl-core + make DESTDIR=./sandbox RUN_PREFIX=`pwd`/sandbox/usr/local install source ./sandbox/env.sh && uzbl-core --uri http://www.uzbl.org --verbose make DESTDIR=./sandbox uninstall rm -rf ./sandbox/usr test-uzbl-browser-sandbox: uzbl-browser - make DESTDIR=./sandbox RUN_PREFIX=`pwd`/sandbox/usr/local install-uzbl-browser + make DESTDIR=./sandbox RUN_PREFIX=`pwd`/sandbox/usr/local install source ./sandbox/env.sh && uzbl-cookie-daemon restart -nv & source ./sandbox/env.sh && uzbl-event-manager restart -nav & source ./sandbox/env.sh && uzbl-browser --uri http://www.uzbl.org --verbose @@ -77,7 +77,6 @@ test-uzbl-browser-sandbox: uzbl-browser make DESTDIR=./sandbox uninstall rm -rf ./sandbox/usr - clean: rm -f uzbl-core rm -f uzbl-core.o diff --git a/examples/data/uzbl/scripts/uzbl-cookie-daemon b/examples/data/uzbl/scripts/uzbl-cookie-daemon index 87a2e87..fde8b8e 100755 --- a/examples/data/uzbl/scripts/uzbl-cookie-daemon +++ b/examples/data/uzbl/scripts/uzbl-cookie-daemon @@ -304,6 +304,9 @@ class CookieMonster: if daemon_running(config['cookie_socket']): sys.exit(1) + # Create cookie daemon socket. + self.create_socket() + # Daemonize process. if config['daemon_mode']: echo("entering daemon mode") @@ -322,9 +325,6 @@ class CookieMonster: self._running = True while self._running: - # Create cookie daemon socket. - self.create_socket() - try: # Enter main listen loop. self.listen() @@ -345,6 +345,8 @@ class CookieMonster: # Always delete the socket before calling create again. self.del_socket() + # Create cookie daemon socket. + self.create_socket() def load_whitelist(self): diff --git a/examples/data/uzbl/scripts/uzbl-event-manager b/examples/data/uzbl/scripts/uzbl-event-manager index 7a02da9..916259a 100755 --- a/examples/data/uzbl/scripts/uzbl-event-manager +++ b/examples/data/uzbl/scripts/uzbl-event-manager @@ -583,16 +583,16 @@ class UzblEventDaemon(dict): def run(self): '''Main event daemon loop.''' + # Create event daemon socket. + self._create_server_socket() + echo('listening on: %s' % self.socket_location) + if CONFIG['daemon_mode']: echo('entering daemon mode.') daemonize() # The pid has changed so update the pid file. make_pid_file(CONFIG['pid_file']) - # Create event daemon socket. - self._create_server_socket() - echo('listening on: %s' % self.socket_location) - # Now listen for incoming connections and or data. self.listen() diff --git a/sandbox/env.sh b/sandbox/env.sh index 0806055..157ef36 100755 --- a/sandbox/env.sh +++ b/sandbox/env.sh @@ -5,8 +5,8 @@ # - executing limits scope of variables too much (even with exporting) # maybe we should spawn processes from here with an 'exec' at the end? -XDG_DATA_HOME=./sandbox/examples/data -XDG_CACHE_HOME=./sandbox/examples/cache -XDG_CONFIG_HOME=./sandbox/examples/config -PATH=".sandbox/usr/local/share/uzbl/examples/data/uzbl/scripts/:$PATH" # needed when running uzbl-browser from here. not sure anymore why -PATH="./sandbox/usr/local/bin:$PATH" # needed to run uzbl-browser etc from here +export XDG_DATA_HOME=./sandbox/examples/data +export XDG_CACHE_HOME=./sandbox/examples/cache +export XDG_CONFIG_HOME=./sandbox/examples/config +export PATH=".sandbox/usr/local/share/uzbl/examples/data/uzbl/scripts/:$PATH" # needed when running uzbl-browser from here. not sure anymore why +export PATH="./sandbox/usr/local/bin:$PATH" # needed to run uzbl-browser etc from here |