diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 35 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | examples/config/config | 1 | ||||
| -rw-r--r-- | examples/data/plugins/keycmd.py | 2 |
5 files changed, 25 insertions, 16 deletions
@@ -3,4 +3,3 @@ uzbl-core *.pyc *~ tags -version.mk @@ -87,7 +87,10 @@ strip: install: install-uzbl-core install-uzbl-browser install-uzbl-tabbed -install-uzbl-core: all +install-dirs: + [ -d "$(INSTALLDIR)/bin" ] || install -d -m755 $(INSTALLDIR)/bin + +install-uzbl-core: all install-dirs install -d $(INSTALLDIR)/share/uzbl/ install -d $(DOCDIR) install -m644 docs/* $(DOCDIR)/ @@ -96,18 +99,24 @@ install-uzbl-core: all install -m644 AUTHORS $(DOCDIR)/ cp -r examples $(INSTALLDIR)/share/uzbl/ chmod 755 $(INSTALLDIR)/share/uzbl/examples/data/scripts/* - sed -i 's#^set prefix.*=.*#set prefix = $(RUN_PREFIX)#' $(INSTALLDIR)/share/uzbl/examples/config/config - install -D -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core - -install-uzbl-browser: - install -D -m755 src/uzbl-browser $(INSTALLDIR)/bin/uzbl-browser - install -D -m755 examples/data/scripts/uzbl-cookie-daemon $(INSTALLDIR)/bin/uzbl-cookie-daemon - install -D -m755 examples/data/scripts/uzbl-event-manager $(INSTALLDIR)/bin/uzbl-event-manager - sed -i 's#^PREFIX=.*#PREFIX=$(RUN_PREFIX)#' $(INSTALLDIR)/bin/uzbl-browser - sed -i "s#^PREFIX = .*#PREFIX = '$(RUN_PREFIX)'#" $(INSTALLDIR)/bin/uzbl-event-manager - -install-uzbl-tabbed: - install -D -m755 examples/data/scripts/uzbl-tabbed $(INSTALLDIR)/bin/uzbl-tabbed + mv $(INSTALLDIR)/share/uzbl/examples/config/config{,.bak} + sed 's#^set prefix.*=.*#set prefix = $(RUN_PREFIX)#' < $(INSTALLDIR)/share/uzbl/examples/config/config.bak > $(INSTALLDIR)/share/uzbl/examples/config/config + rm $(INSTALLDIR)/share/uzbl/examples/config/config.bak + install -m755 uzbl-core $(INSTALLDIR)/bin/uzbl-core + +install-uzbl-browser: install-dirs + install -m755 src/uzbl-browser $(INSTALLDIR)/bin/uzbl-browser + install -m755 examples/data/scripts/uzbl-cookie-daemon $(INSTALLDIR)/bin/uzbl-cookie-daemon + install -m755 examples/data/scripts/uzbl-event-manager $(INSTALLDIR)/bin/uzbl-event-manager + mv $(INSTALLDIR)/bin/uzbl-browser{,.bak} + sed 's#^PREFIX=.*#PREFIX=$(RUN_PREFIX)#' < $(INSTALLDIR)/bin/uzbl-browser.bak > $(INSTALLDIR)/bin/uzbl-browser + rm $(INSTALLDIR)/bin/uzbl-browser.bak + mv $(INSTALLDIR)/bin/uzbl-event-manager{,.bak} + sed "s#^PREFIX = .*#PREFIX = '$(RUN_PREFIX)'#" < $(INSTALLDIR)/bin/uzbl-event-manager.bak > $(INSTALLDIR)/bin/uzbl-event-manager + rm $(INSTALLDIR)/bin/uzbl-event-manager.bak + +install-uzbl-tabbed: install-dirs + install -m755 examples/data/scripts/uzbl-tabbed $(INSTALLDIR)/bin/uzbl-tabbed # you probably only want to do this manually when testing and/or to the sandbox. not meant for distributors install-example-data: @@ -311,7 +311,7 @@ file). * `javascript_windows`: Whether javascript can open windows automatically * `shell_cmd`: Alias which will be expanded to use shell commands (eg `sh -c`). * `print_events`: show events on stdout -* `proxy_url`: HTTP traffic SOCKS proxy (eg: `http://<host>:<port>`). +* `proxy_url`: set HTTP proxy (eg: `http://<host>:<port>`). * `max_conns`: Max simultaneous connections (default: 100). * `max_conns_host`: max simultaneous connections per hostname (default: 6) * `view_source`: Set the browser in "view source" mode (default 0). Any URI diff --git a/examples/config/config b/examples/config/config index bb2c066..ceec02e 100644 --- a/examples/config/config +++ b/examples/config/config @@ -229,6 +229,7 @@ set ebind = @mode_bind global,-insert # Web searching binds @cbind gg<Google:>_ = uri http://www.google.com/search?q=\@<encodeURIComponent(%r)>\@ +@cbind ddg<DuckDuckGo:>_ = uri http://duckduckgo.com/?q=%s @cbind \\awiki<Archwiki:>_ = uri http://wiki.archlinux.org/index.php/Special:Search?search=\@<encodeURIComponent(%r)>\@&go=Go @cbind \\wiki<Wikipedia:>_ = uri http://en.wikipedia.org/w/index.php?title=Special:Search&search=\@<encodeURIComponent(%r)>\@&go=Go diff --git a/examples/data/plugins/keycmd.py b/examples/data/plugins/keycmd.py index b600afe..2fb2283 100644 --- a/examples/data/plugins/keycmd.py +++ b/examples/data/plugins/keycmd.py @@ -426,7 +426,7 @@ def keycmd_backspace(uzbl, *args): '''Removes the character at the cursor position in the keycmd.''' k = uzbl.keylet - if not k.keycmd: + if not k.keycmd or not k.cursor: return k.keycmd = k.keycmd[:k.cursor-1] + k.keycmd[k.cursor:] |