bin: simplify sway-run

1 files changed, 13 insertions, 39 deletions

diff --git a/bin/sway-run b/bin/sway-run
index 5e0bd1d..cfb2e0a 100755
--- a/bin/sway-run
+++ b/bin/sway-run
@@ -1,45 +1,19 @@
 #!/bin/sh
 set -e
 
-SWAY_BIN=${SWAY_BIN:-/usr/bin/sway}
-SWAY_ARGS=${SWAY_ARGS:-}
-SWAY_USER=${SWAY_USER:-robert}
-sway_user_id=$(id -u "${SWAY_USER}")
-SWAY_TTY=${SWAY_TTY:-7}
-MANUAL=
-
-export XDG_RUNTIME_DIR=/run/user/"${sway_user_id}"
-source /home/"${SWAY_USER}"/.config/sway/env
 
-while getopts ":dcDmh" o; do
-    case $o in
-        d) SWAY_ARGS="$SWAY_ARGS --debug" ;;
-        D)
-            export XDG_RUNTIME_DIR=/tmp/sway-run-debug
-            [ ! -d "${XDG_RUNTIME_DIR}" ] && mkdir "${XDG_RUNTIME_DIR}" && chmod 700 "${XDG_RUNTIME_DIR}"
-            ;;
-        c) SWAY_ARGS="${SWAY_ARGS} --config /home/${SWAY_USER}/.config/sway/simple.conf --debug" ;;
-        m) MANUAL=1 ;;
-        h) echo "usage: $0 [-dcDLh]"; exit 0 ;;
-        *) echo "unknown flag: $o" 1>&2
-    esac
-done
-shift $((OPTIND-1))
+SWAY_BIN=${SWAY_BIN:-sway}
+SWAY_ARGS=${SWAY_ARGS:-}
+LOGFILE=/tmp/sway.log
 
-ts="$(date -u --rfc-3339=seconds | tr ' ' 'T')"
-log=/var/log/sway/${ts}.log
+(
+	printf -- "\n--- sway ---\n"
+	printf "DATE: $(date)\n"
+	printf "EXEC: ${SWAY_BIN} ${SWAY_ARGS}\n"
+	printf "USER: $(id -u)\n"
+	[ -n "${DBUS_SESSION_BUS_ADDRESS}" ] && printf "DBUS: ${DBUS_SESSION_BUS_ADDRESS}\n"
+	printf -- "---\n"
+) >>${LOGFILE}
 
-if [ -n "${MANUAL}" ]; then
-    cat <<EOF | doas sh -s
-# prepare tty
-chown "$SWAY_USER" "/dev/tty${SWAY_TTY}"
-chmod 600 "/dev/tty${SWAY_TTY}"
-# launch sway on new tty
-su --preserve-environment --login --command \
-    "openvt --switch --console ${SWAY_TTY} -- dbus-run-session ${SWAY_BIN} -Ddamage=rerender ${SWAY_ARGS} 1>&2 2>${log}" \
-    "${SWAY_USER}"
-EOF
-else
-    exec dbus-run-session "${SWAY_BIN}" -Ddamage=rerender ${SWAY_ARGS} $@ 1>&2 2>"${log}"
-    # exec "${SWAY_BIN}" -Ddamage=rerender ${SWAY_ARGS} $@ 1>&2 2>"${log}"
-fi
+exec dbus-run-session -- ${SWAY_BIN} ${SWAY_ARGS} 1>&2 2>>${LOGFILE}
+# exec dbus-launch --exit-with-session ${SWAY_BIN} ${SWAY_ARGS} 1>&2 2>>${LOGFILE}