diff options
| author |  Dieter Plaetinck <dieter@plaetinck.be> | 2010-01-01 17:54:19 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2010-01-01 17:54:19 +0100 |
| commit | 9816975a1c7207cf98dccc04a38297d7b681201a (patch) | |
| tree | 9c5781475f7819c3412a9bf0ae2c598b0a5c1e9c | |
| parent | 9b6438a878ca2d8696484438430971507219f3ed (diff) | |
| parent | 2fde92e6a9a8223493c277d20b6aeb39f377d9cd (diff) | |
Merge branch 'master' into experimental
| -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)) |