From b9013fb779379c502b7707169eeac7dc15cfdd51 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Sat, 5 Sep 2009 19:22:30 +0200 Subject: move 'uzbl' to more specific 'uzbl-core' program, and add 'uzbl-browser' script which wraps around it to make the browser --- uzbl-browser | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100755 uzbl-browser (limited to 'uzbl-browser') diff --git a/uzbl-browser b/uzbl-browser new file mode 100755 index 0000000..93ba2d7 --- /dev/null +++ b/uzbl-browser @@ -0,0 +1,9 @@ +#!/bin/sh +# this script implements are more useful "browsing experience". make sure to have the event manager in the appropriate place. + +if [ x"$XDG_DATA_HOME" != 'x' ] +then + uzbl-core "$@" | $XDG_DATA_HOME/uzbl/scripts/event_manager.py +else + uzbl-core "$@" | $HOME/.local/share/uzbl/scripts/event_manager.py +fi -- cgit v1.2.3 From 207c292171f174d7ebf06fdb3258cb82d1b3a342 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Sun, 6 Sep 2009 19:12:24 +0200 Subject: more useful uzbl-browser script that can share event manager with multiple instances through a fifo. also starting the cookie daemon is implemented --- uzbl-browser | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) (limited to 'uzbl-browser') diff --git a/uzbl-browser b/uzbl-browser index 93ba2d7..1e950db 100755 --- a/uzbl-browser +++ b/uzbl-browser @@ -1,9 +1,35 @@ #!/bin/sh -# this script implements are more useful "browsing experience". make sure to have the event manager in the appropriate place. +# this script implements are more useful "browsing experience". +# We are assuming you want to use the event_manager.py and cookie_daemon.py. +# So, you must have them in the appropriate place, and cookie_daemon_socket must be configured in the default location -if [ x"$XDG_DATA_HOME" != 'x' ] +# Also, we assume existence of fifo/socket == correctly functioning cookie_daemon/event_manager. +# Checking correct functioning of the daemons here would be too complex here, and it's not implemented in uzbl-core either. +# But this shouldn't cause much problems.. + + +if [ x"$XDG_DATA_HOME" == 'x' ] then - uzbl-core "$@" | $XDG_DATA_HOME/uzbl/scripts/event_manager.py -else - uzbl-core "$@" | $HOME/.local/share/uzbl/scripts/event_manager.py + XDG_DATA_HOME=$HOME/.local/share fi + +if [ x"$XDG_CACHE_HOME" == 'x' ] +then + XDG_CACHE_HOME=$HOME/.cache +fi + +if [ ! -S $XDG_CACHE_HOME/uzbl/cookie_daemon_socket ] +then + $XDG_DATA_HOME/uzbl/scripts/cookie_daemon.py +fi + +FIFO=/tmp/uzbl-fifo-eventmanager +EVENT_MANAGER=$XDG_DATA_HOME/uzbl/scripts/event_manager.py + +if [ ! -p $FIFO ] +then + mkfifo $FIFO + (cat $FIFO | $EVENT_MANAGER && rm $FIFO) & +fi + +uzbl-core "$@" > $FIFO -- cgit v1.2.3 From 7f03824c5ff3145e441a12766077c079e4a3676d Mon Sep 17 00:00:00 2001 From: Mason Larobina Date: Fri, 11 Sep 2009 03:08:10 +0800 Subject: Update uzbl-browser to launch uzbl & event_manager.py talking with sockets. --- uzbl-browser | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'uzbl-browser') diff --git a/uzbl-browser b/uzbl-browser index 1e950db..4934e89 100755 --- a/uzbl-browser +++ b/uzbl-browser @@ -23,13 +23,15 @@ then $XDG_DATA_HOME/uzbl/scripts/cookie_daemon.py fi -FIFO=/tmp/uzbl-fifo-eventmanager -EVENT_MANAGER=$XDG_DATA_HOME/uzbl/scripts/event_manager.py -if [ ! -p $FIFO ] +SOCKET_ID="$RANDOM$RANDOM" +SOCKET_DIR="/tmp" +SOCKET_PATH="$SOCKET_DIR/uzbl_socket_$SOCKET_ID" + +uzbl-core -n $SOCKET_ID & +$XDG_DATA_HOME/uzbl/scripts/event_manager.py -vs $SOCKET_PATH + +if [[ -S $SOCKETPATH ]] then - mkfifo $FIFO - (cat $FIFO | $EVENT_MANAGER && rm $FIFO) & + rm $SOCKET_PATH fi - -uzbl-core "$@" > $FIFO -- cgit v1.2.3 From 0842d72ceac26185c51f9b0688107eb1faa6931d Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Sat, 12 Sep 2009 18:27:39 +0200 Subject: pass on options to uzbl-browser --- uzbl-browser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'uzbl-browser') diff --git a/uzbl-browser b/uzbl-browser index 4934e89..eeabcc0 100755 --- a/uzbl-browser +++ b/uzbl-browser @@ -28,7 +28,7 @@ SOCKET_ID="$RANDOM$RANDOM" SOCKET_DIR="/tmp" SOCKET_PATH="$SOCKET_DIR/uzbl_socket_$SOCKET_ID" -uzbl-core -n $SOCKET_ID & +uzbl-core "$@" -n $SOCKET_ID & $XDG_DATA_HOME/uzbl/scripts/event_manager.py -vs $SOCKET_PATH if [[ -S $SOCKETPATH ]] -- cgit v1.2.3 From 6614e842b56f3372034823be215f68d9d7bd1ce1 Mon Sep 17 00:00:00 2001 From: Maximilian Gass Date: Fri, 25 Sep 2009 12:51:27 +0200 Subject: uzbl-browser: fixed bashims --- uzbl-browser | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'uzbl-browser') diff --git a/uzbl-browser b/uzbl-browser index eeabcc0..f5936e3 100755 --- a/uzbl-browser +++ b/uzbl-browser @@ -8,12 +8,12 @@ # But this shouldn't cause much problems.. -if [ x"$XDG_DATA_HOME" == 'x' ] +if [ -z "$XDG_DATA_HOME" ] then XDG_DATA_HOME=$HOME/.local/share fi -if [ x"$XDG_CACHE_HOME" == 'x' ] +if [ -z "$XDG_CACHE_HOME" ] then XDG_CACHE_HOME=$HOME/.cache fi @@ -31,7 +31,7 @@ SOCKET_PATH="$SOCKET_DIR/uzbl_socket_$SOCKET_ID" uzbl-core "$@" -n $SOCKET_ID & $XDG_DATA_HOME/uzbl/scripts/event_manager.py -vs $SOCKET_PATH -if [[ -S $SOCKETPATH ]] +if [ -S $SOCKETPATH ] then rm $SOCKET_PATH fi -- cgit v1.2.3 From 5ac4716e4775609adf4af5ef5408e662a8f1692f Mon Sep 17 00:00:00 2001 From: Mason Larobina Date: Wed, 30 Sep 2009 18:45:12 +0800 Subject: Fix socket exists check in uzbl-browser before force-deletion. --- uzbl-browser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'uzbl-browser') diff --git a/uzbl-browser b/uzbl-browser index f5936e3..f5ad14b 100755 --- a/uzbl-browser +++ b/uzbl-browser @@ -31,7 +31,7 @@ SOCKET_PATH="$SOCKET_DIR/uzbl_socket_$SOCKET_ID" uzbl-core "$@" -n $SOCKET_ID & $XDG_DATA_HOME/uzbl/scripts/event_manager.py -vs $SOCKET_PATH -if [ -S $SOCKETPATH ] +if [[ -S $SOCKETPATH ]] then rm $SOCKET_PATH fi -- cgit v1.2.3 From e0f17a169a571ce06492910a8c7504684e81c899 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Tue, 6 Oct 2009 20:11:52 +0200 Subject: misc --- examples/config/uzbl/config | 2 +- uzbl-browser | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'uzbl-browser') diff --git a/examples/config/uzbl/config b/examples/config/uzbl/config index fd5fe52..e002178 100644 --- a/examples/config/uzbl/config +++ b/examples/config/uzbl/config @@ -123,7 +123,7 @@ set socket_dir = /tmp @bind gg _ = uri http://www.google.com/search?q=%s # Enclose the executable in quotes if it has spaces. Any additional parameters you use will # appear AFTER the default parameters -#@bind B = spawn @scripts_dir}/insert_bookmark.sh +#@bind B = spawn @scripts_dir/insert_bookmark.sh @bind U = spawn @scripts_dir/load_url_from_history.sh @bind u = spawn @scripts_dir/load_url_from_bookmarks.sh # with the sample yank script, you can yank one of the arguments into clipboard/selection diff --git a/uzbl-browser b/uzbl-browser index f5ad14b..202db11 100755 --- a/uzbl-browser +++ b/uzbl-browser @@ -31,6 +31,7 @@ SOCKET_PATH="$SOCKET_DIR/uzbl_socket_$SOCKET_ID" uzbl-core "$@" -n $SOCKET_ID & $XDG_DATA_HOME/uzbl/scripts/event_manager.py -vs $SOCKET_PATH +# TODO: make posix sh compliant. [ -S ] is said to not work. what about test -S ? if [[ -S $SOCKETPATH ]] then rm $SOCKET_PATH -- cgit v1.2.3