diff options
| author |  Mason Larobina <mason.larobina@gmail.com> | 2010-01-02 06:13:45 +0800 |
|---|---|---|
| committer | Mason Larobina <mason.larobina@gmail.com> | 2010-01-02 06:13:45 +0800 |
| commit | cf68b7328ed9a8eebe4033ccccc8016d5afb5de2 (patch) | |
| tree | 7aeb02153aa0163893935e7640e19748027be769 | |
| parent | 759143756ff5ab9076b5d9e1a3839d1e8690ede2 (diff) | |
| parent | 2fde92e6a9a8223493c277d20b6aeb39f377d9cd (diff) | |
Merge branch 'master' of git://github.com/Dieterbe/uzbl
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rwxr-xr-x | examples/data/uzbl/scripts/insert_bookmark.sh | 2 | ||||
| -rwxr-xr-x | examples/data/uzbl/scripts/uzbl-tabbed | 2 |
3 files changed, 4 insertions, 1 deletions
@@ -17,6 +17,7 @@ In alphabetical order: (neutralinsomniac) - load_progress = 0 fix (salinasv) - move some variables to heap (sentientswitch) - Cleaned up code. Added some commands. + (tczy) - patches Aaron Griffin (phrakture) - Makefile patches to build on OSX Abel Camarillo (00z) - various portability fixes, such as BSD fixes for Makefile and posix shell scripts Aldrik Dunbar (n30n) - scroll % script diff --git a/examples/data/uzbl/scripts/insert_bookmark.sh b/examples/data/uzbl/scripts/insert_bookmark.sh index e04e6d4..c34e7db 100755 --- a/examples/data/uzbl/scripts/insert_bookmark.sh +++ b/examples/data/uzbl/scripts/insert_bookmark.sh @@ -6,6 +6,8 @@ file=${XDG_DATA_HOME:-$HOME/.local/share}/uzbl/bookmarks which zenity &>/dev/null || exit 2 entry=`zenity --entry --text="Add bookmark. add tags after the '\t', separated by spaces" --entry-text="$6 $7\t"` +exitstatus=$? +if [ $exitstatus -ne 0 ]; then exit $exitstatus; fi url=`echo $entry | awk '{print $1}'` # TODO: check if already exists, if so, and tags are different: ask if you want to replace tags diff --git a/examples/data/uzbl/scripts/uzbl-tabbed b/examples/data/uzbl/scripts/uzbl-tabbed index bb9b9a2..d93a3f4 100755 --- a/examples/data/uzbl/scripts/uzbl-tabbed +++ b/examples/data/uzbl/scripts/uzbl-tabbed @@ -1010,7 +1010,7 @@ class UzblTabbed: instance.''' binds = [] - bind_format = r'bind %s = sh "echo \"%s\" > \"%s\""' + bind_format = r'@bind %s = sh "echo \"%s\" > \"%s\""' bind = lambda key, action: binds.append(bind_format % (key, action,\ self.fifo_socket)) |