1 files changed, 76 insertions, 54 deletions
diff --git a/examples/data/scripts/session.sh b/examples/data/scripts/session.sh
index 1059b5e..36e0c19 100755
--- a/examples/data/scripts/session.sh
+++ b/examples/data/scripts/session.sh
@@ -1,62 +1,84 @@
 #!/bin/sh
+#
+# Very simple session manager for uzbl-browser.
+# 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 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.
 
-# Very simple session manager for uzbl-browser.  When called with "endsession" as the
-# argument, it'll backup $sessionfile, look for fifos in $fifodir and
-# instruct each of them to store their current url in $sessionfile and
-# terminate themselves.  Run with "launch" as the argument and an instance of
-# uzbl-browser will be launched for each stored url.  "endinstance" is used internally
-# and doesn't need to be called manually at any point.
-# Add a line like 'bind quit = /path/to/session.sh endsession' to your config
-
-[ -d ${XDG_DATA_HOME:-$HOME/.local/share}/uzbl ] || exit 1
-scriptfile=$0 				# this script
-sessionfile=${XDG_DATA_HOME:-$HOME/.local/share}/uzbl/browser-session # the file in which the "session" (i.e. urls) are stored
-configfile=${XDG_DATA_HOME:-$HOME/.local/share}/uzbl/config   # uzbl configuration file
-UZBL="uzbl-browser -c $configfile"           # add custom flags and whatever here.
-
-fifodir=/tmp # remember to change this if you instructed uzbl to put its fifos elsewhere
-thisfifo="$4"
-act="$8"
-url="$6"
-
-if [ "$act." = "." ]; then
-   act="$1"
+if [ -z "$UZBL_UTIL_DIR" ]; then
+    # we're being run standalone, we have to figure out where $UZBL_UTIL_DIR is
+    # using the same logic as uzbl-browser does.
+    UZBL_UTIL_DIR=${XDG_DATA_HOME:-$HOME/.local/share}/uzbl/scripts/util
+    if ! [ -d "$UZBL_UTIL_DIR" ]; then
+        PREFIX=$(grep '^PREFIX' "$(which uzbl-browser)" | sed 's/.*=//')
+        UZBL_UTIL_DIR=$PREFIX/share/uzbl/examples/data/scripts/util
+    fi
+fi
+
+. "$UZBL_UTIL_DIR"/uzbl-dir.sh
+[ -d "$UZBL_DATA_DIR" ] || exit 1
+
+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
+    # discard the uzbl arguments
+    shift 7
 fi
 
+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 $sessionfile`
-    if [ "$urls." = "." ]; then
-      $UZBL
-    else
-      for url in $urls; do
-        $UZBL --uri "$url" &
-      done
-    fi
-    exit 0
-    ;;
+    "launch" )
+        urls=$(cat "$UZBL_SESSION_FILE")
+        if [ -z "$urls" ]; then
+            $UZBL
+        else
+            for url in $urls; do
+                $UZBL --uri "$url" &
+            done
+        mv "$UZBL_SESSION_FILE" "$UZBL_SESSION_FILE~"
+        fi
+        ;;
 
-  "endinstance" )
-    if [ "$url" != "(null)" ]; then
-      echo "$url" >> $sessionfile;
-    fi
-    echo "exit" > "$thisfifo"
-    ;;
-
-  "endsession" )
-    mv "$sessionfile" "$sessionfile~"
-    for fifo in $fifodir/uzbl_fifo_*; do
-      if [ "$fifo" != "$thisfifo" ]; then
-        echo "spawn $scriptfile endinstance" > "$fifo"
-      fi
-    done
-    echo "spawn $scriptfile endinstance" > "$thisfifo"
-    ;;
-
-  * ) echo "session manager: bad action"
-      echo "Usage: $scriptfile [COMMAND] where commands are:"
-      echo " launch 	- Restore a saved session or start a new one"
-      echo " endsession	- Quit the running session. Must be called from uzbl"
-      ;;
+    "endinstance" )
+        if [ -z "$UZBL_FIFO" ]; then
+            echo "session manager: endinstance must be called from uzbl"
+            exit 1
+        fi
+        [ "$UZBL_URI" != "(null)" ] && echo "$UZBL_URI" >> "$UZBL_SESSION_FILE"
+        echo exit > "$UZBL_FIFO"
+        ;;
+
+    "endsession" )
+        for fifo in "$UZBL_FIFO_DIR"/uzbl_fifo_*; do
+            if [ "$fifo" != "$UZBL_FIFO" ]; then
+                echo "spawn $scriptfile endinstance" > "$fifo"
+            fi
+        done
+        [ -z "$UZBL_FIFO" ] || echo "spawn $scriptfile endinstance" > "$UZBL_FIFO"
+        ;;
+
+    * )
+        echo "session manager: bad action"
+        echo "Usage: $scriptfile [COMMAND] where commands are:"
+        echo " launch      - Restore a saved session or start a new one"
+        echo " endinstance - Quit the current instance. Must be called from uzbl"
+        echo " endsession  - Quit the running session."
+        ;;
 esac