Merge branch 'dieter/experimental' into experimental

5 files changed, 15 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index 97f5761..a70ca9a 100644
--- a/Makefile
+++ b/Makefile
@@ -20,4 +20,5 @@ install:
 	install -d $(DESTDIR)/usr/share/uzbl/examples
 	install -D -m755 uzbl $(DESTDIR)/usr/bin/uzbl
 	cp -ax examples $(DESTDIR)/usr/share/uzbl/
+	install -D -m644 CHECKLIST $(DESTDIR)/usr/share/uzbl/docs
 	install -D -m644 README $(DESTDIR)/usr/share/uzbl/docs
diff --git a/README b/README
index ed8471a..c5e3fcf 100644
--- a/README
+++ b/README
@@ -1,3 +1,13 @@
+TO NEW PEOPLE:
+ - please read the README in /usr/share/uzbl/docs
+ - invoke uzbl --help
+ - to get you started: uzbl --uri 'http://www.archlinux.org' --config /usr/share/uzbl/examples/configs/sampleconfig
+ - study the sample config, have a look at all the bindings, and note how you can call the scripts to load new url from history and the bookmarks file
+ - inserting new bookmarks is not working yet. it will be soon.
+ - note that there is no url bar. all url editing is supposed to happen _outside_ of uzbl.
+   for now, you can use the load_from_* dmenu based scripts to pick a url or type a new one (soon there will be a decent url editor addon) or write commands into the fifo (see /usr/share/uzbl/docs/CHECKLIST)
+
+
 - Uzbl.
   In my opinion, any program can only be really useful if it complies to the unix philosophy.
   Web browsers are frequent violators of this principle.  Time to change that!
diff --git a/TODO b/TODO
index 8a0cb91..5b300e3 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,5 @@
 ASAP
+* do a clean implementation of bindings that need arguments (eg insert_bookmark needs the uri.)
 
 * implement all the ideas from README
 * get a logo
diff --git a/examples/scripts/insert_bookmark.sh b/examples/scripts/insert_bookmark.sh
index af6ca8a..be17c05 100755
--- a/examples/scripts/insert_bookmark.sh
+++ b/examples/scripts/insert_bookmark.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
 # you probably want your bookmarks file in your $XDG_DATA_HOME ( eg $HOME/.local/share/uzbl/bookmarks)
+
 if [ -f /usr/share/uzbl/examples/bookmarks ]
 then
-	file=/usr/share/uzbl/examples/bookmarks
+	file=/usr/share/uzbl/examples/bookmarks # you will probably get permission denied errors here. pick a file in your ~
 else
 	file=./examples/bookmarks #useful when developing
 fi
diff --git a/examples/scripts/load_url_from_bookmarks.sh b/examples/scripts/load_url_from_bookmarks.sh
index fd9179e..ca512eb 100755
--- a/examples/scripts/load_url_from_bookmarks.sh
+++ b/examples/scripts/load_url_from_bookmarks.sh
@@ -8,5 +8,5 @@ else
         file=./examples/bookmarks #useful when developing
 fi
 
-goto=`awk '{print $1}' $history_file | dmenu` #NOTE: it's the job of the script that inserts bookmarks to make sure there are no dupes.
+goto=`awk '{print $1}' $file | dmenu` #NOTE: it's the job of the script that inserts bookmarks to make sure there are no dupes.
 [ -n "$goto" ] && echo "uri $goto" > $4