reimplement firestart

1 files changed, 7 insertions, 56 deletions

diff --git a/firestart b/firestart
index abb15f3..1daf05c 100755
--- a/firestart
+++ b/firestart
@@ -1,63 +1,14 @@
 #!/bin/bash
 
-die() { printf "%s: Error: %s\n" "$0" "$*" >&2; exit 1; }
-
-# Test DEVICE WRITE OPS BY WRITEOPS
-test_write_ops()
-{
-    if ! [ -e "$1" ]
-    then
-        mkdir -p "$(dirname "$1")"
-        sync
-        begin=$(date +%s%N)
-        dd if=/dev/urandom of="$DIR"/urandom.out bs=1M count=300
-        sync
-        end=$(date +%s%N)
-        ops=$(( (end - begin) / 1000000000 ))
-        rm "$DIR"/urandom.out
-        echo "$ops" > "$1"
-    fi
-    cat "$1"
-}
-
 CMD=firefox
-UNIT=$CMD
-DIR=~/.mozilla
-MEMORY_MAX=50%
-READ_OPS=1G
-WRITE_OPS=$READ_OPS
-CONFDIR=$HOME/.config/firestart
-
-if [ -e "$CONFDIR"/conf ]
-then
-    . "$CONFDIR"/conf
-fi
-
-WRITE_OPS=$(test_write_ops "$CONFDIR"/diskspeed.dat)
-WRITE_OPS=${WRITE_OPS%.*}
-READ_OPS=$WRITE_OPS
+UNIT=$CMD@$DISPLAY
 
 if systemctl --user is-active "$UNIT" >/dev/null
 then
-    exec "$CMD" "$@" # Asks existing firefox to open a new window.
-    exit
+    # Asks existing firefox to open a new window.  Technically is racy,
+    # since the unit could become active after our check.
+    exec "$CMD" "$@"
+else
+    systemctl --user reset-failed "$UNIT" 2>/dev/null
+    systemctl --user start "$UNIT"
 fi
-
-[ -e "$DIR" ] || die "does not exist: $DIR"
-[ -d "$DIR" ] || die "not a directory: $DIR"
-
-DEV=$(echo $(findmnt --target "$DIR" -o MAJ:MIN -n))
-[ "$DEV" ] || die "could not determine backing device for $DIR"
-
-firefox-io-slayer launch-unit
-
-systemctl --user reset-failed "$UNIT" 2>/dev/null
-systemd-run --user \
-            --unit "$UNIT" \
-            --property PassEnvironment='DISPLAY XAUTHORITY' \
-            --property MemoryMax="$MEMORY_MAX" \
-            --property IOReadIOPSMax="$DEV $READ_OPS" \
-            --property IOWriteIOPSMax="$DEV $WRITE_OPS" \
-            --property Restart="on-failure" \
-            -- \
-            "$CMD" "$@"