normalize file locations

4 files changed, 100 insertions, 1 deletions

diff --git a/src/firefox-io-slayer-redux b/src/firefox-io-slayer
index fe54e37..fe54e37 100755
--- a/src/firefox-io-slayer-redux
+++ b/src/firefox-io-slayer
diff --git a/src/firestart b/src/firestart
new file mode 100755
index 0000000..5cc1c92
--- /dev/null
+++ b/src/firestart
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+UNIT=firefox@$DISPLAY
+
+if systemctl --user is-active "$UNIT" >/dev/null
+then
+    echo "Attemping to contact existing Firefox instance." >&2
+    # Ask the existing firefox to open a new window.
+
+    # Firefox does not include an official API to do this in a way that
+    # is not racy.  If we merely do this:
+    #
+    #     exec firefox "$@"
+    #
+    # ...then the unit could become inactive after our check, in which
+    # case this launches a new firefox outside the container!
+    #
+    # So instead, we launch the same command using a systemd container
+    # that prevents Firefox from forking off a new process.
+    #
+    # Well, actually, we let it fork off _one_ process, since otherwise
+    # it segfaults.  But this _does_ happen to prevent it starting a new
+    # firefox instance!  Firefox safely segfaults if it is limited this
+    # way while trying to start a new instance.
+    #
+    # A more "correct" approach is available here:
+    # https://github.com/ayosec/findfox
+    exec systemd-run \
+      --user \
+      --property Environment="DISPLAY=$DISPLAY" \
+      --property Environment=XAUTHORITY="$XAUTHORITY" \
+      --property TasksMax=2 \
+      --wait \
+      --pipe \
+      -q \
+      -- /bin/sh -c 'exec firefox "$@"' sh "$@"
+else
+    systemctl --user reset-failed "$UNIT" 2>/dev/null
+    systemctl --user start "$UNIT"
+fi
diff --git a/src/firestartx b/src/firestartx
new file mode 100755
index 0000000..636fc84
--- /dev/null
+++ b/src/firestartx
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+get_new_display()
+{
+    for ((n=1; n<99; ++n))
+    do
+        if [ ! -e /tmp/.X$n-lock ]
+        then
+            NEW_DISPLAY=:$n
+            return
+        fi
+    done
+    false
+}
+
+get_new_display || exit
+
+if [ $# = 0 ]
+then
+    set -- firestart
+fi
+
+# TITLE=$* # lol, startx doesn't support arguments with spaces
+TITLE=$1
+TITLE= # blank title documents the screen grab keys in the title
+
+if [ "$1" != firestart ]
+then
+    USE_XINIT=y
+fi
+
+if [ "$USE_XINIT" ]
+then
+    set -x
+    case "$1" in
+        /*) ;;
+        *) f1=$(which "$1") || exit
+           shift
+           set -- "$f1" "$@"
+           ;;
+    esac
+    xinit "$@" -- $(which Xephyr) "$NEW_DISPLAY" -resizeable -p 0 -terminate ${TITLE:+ -title "$TITLE"}
+else
+    set -x
+    dpi=$(xrdb -query | sed -n -e 's/^Xft.dpi:[ \t]*//p')
+    startx -- "$(which Xephyr)" "$NEW_DISPLAY" \
+      -resizeable \
+      -p 0 \
+      -terminate \
+      ${TITLE:+ -title "$TITLE"} \
+      ${dpi:+ -dpi "$dpi"} \
+      &
+    if [ $# -gt 0 ]
+    then
+        DISPLAY=$NEW_DISPLAY "$@" &
+    fi
+    wait
+fi
diff --git a/src/ioslay@.service b/src/ioslay@.service
index 1a00bd4..11db192 100644
--- a/src/ioslay@.service
+++ b/src/ioslay@.service
@@ -1,5 +1,6 @@
 [Unit]
 Description = Kill firefox when it spins the disk
+Requires = firefox@%I
 
 [Service]
-ExecStart = /usr/local/bin/firefox-io-slayer-redux %I
+ExecStart = /usr/local/bin/firefox-io-slayer %I