1 files changed, 20 insertions, 13 deletions

diff --git a/examples/data/scripts/session.sh b/examples/data/scripts/session.sh
index 203cd52..36e0c19 100755
--- a/examples/data/scripts/session.sh
+++ b/examples/data/scripts/session.sh
@@ -1,14 +1,17 @@
 #!/bin/sh
 #
 # Very simple session manager for uzbl-browser.
-# To use, add a line like 'bind quit = spawn @scripts_dir/session.sh endsession'
-# to your config.
-# To restore the session, run this script with the argument "launch". An
-# instance of uzbl-browser will be launched for each stored url.
+# To use, add a line like 'bind quit = spawn @scripts_dir/session.sh' to your
+# config. This binding will exit every instance of uzbl and store the URLs they
+# had open in $UZBL_SESSION_FILE.
 #
-# When called with "endsession" as the argument, it will backup
-# $UZBL_SESSION_FILE, look for fifos in $UZBL_FIFO_DIR and instruct each of them
-# to store its current url in $UZBL_SESSION_FILE and terminate.
+# When a session file exists this script can be run with no arguments (or the
+# argument "launch") to start an instance of uzbl-browser for every stored url.
+#
+# If no session file exists (or if called with "endsession" as the first
+# argument), this script looks for instances of uzbl that have fifos in
+# $UZBL_FIFO_DIR and instructs each of them to store its current url in
+# $UZBL_SESSION_FILE and terminate.
 #
 # "endinstance" is used internally and doesn't need to be called manually.
 
@@ -29,12 +32,17 @@ UZBL="uzbl-browser -c $UZBL_CONFIG_FILE" # add custom flags and whatever here.
 
 if [ $# -gt 1 ]; then
     # this script is being run from uzbl, rather than standalone
-    . "$UZBL_UTIL_DIR"/uzbl-args.sh
+    # discard the uzbl arguments
+    shift 7
 fi
 
-scriptfile=$0                            # this script
+scriptfile=$(readlink -f $0)                            # this script
 act="$1"
 
+if [ -z "$act" ]; then
+  [ -f "$UZBL_SESSION_FILE" ] && act="launch" || act="endsession"
+fi
+
 case $act in
     "launch" )
         urls=$(cat "$UZBL_SESSION_FILE")
@@ -43,8 +51,8 @@ case $act in
         else
             for url in $urls; do
                 $UZBL --uri "$url" &
-                disown
             done
+        mv "$UZBL_SESSION_FILE" "$UZBL_SESSION_FILE~"
         fi
         ;;
 
@@ -53,18 +61,17 @@ case $act in
             echo "session manager: endinstance must be called from uzbl"
             exit 1
         fi
-        [ "$UZBL_URL" != "(null)" ] && echo "$UZBL_URL" >> "$UZBL_SESSION_FILE"
+        [ "$UZBL_URI" != "(null)" ] && echo "$UZBL_URI" >> "$UZBL_SESSION_FILE"
         echo exit > "$UZBL_FIFO"
         ;;
 
     "endsession" )
-        mv "$UZBL_SESSION_FILE" "$UZBL_SESSION_FILE~"
         for fifo in "$UZBL_FIFO_DIR"/uzbl_fifo_*; do
             if [ "$fifo" != "$UZBL_FIFO" ]; then
                 echo "spawn $scriptfile endinstance" > "$fifo"
             fi
         done
-        echo "spawn $scriptfile endinstance" > "$UZBL_FIFO"
+        [ -z "$UZBL_FIFO" ] || echo "spawn $scriptfile endinstance" > "$UZBL_FIFO"
         ;;
 
     * )