bin/vncctl

@@ -1,76 +1,33 @@
-#!/bin/sh
+#!/bin/bash
-
-# cd to the local VNC directory, exit if it fails
-cd "${HOME}/.vnc" || exit 5
 
 # Variables
-file_base="./$(hostname):1."
+declare -a vncctl
+systemctl=systemctl
+systemd_unit=vncserver
+verb="${1:-status}"; shift
+display="${1:-1}"  ; shift
 
-error() {
+# Prepending sudo if necessary
-    >&2 printf '\033[1;31m%s\033[0m %s\n' "ERROR:" "$1"
+case "$verb" in
-    shift
+    start|restart|stop)
-    exit "$1"
+        sudo=sudo
-}
-
-help() {
-    name="$(basename "$0")"
-    cat << EOF
-${name} - Start a VNC server
-
-Usage:
-    ${name} start|status|stop|help
-EOF
-}
-
-usage() {
-    >&2 help
-    error "Invalid usage: ${1}" 1
-}
-
-is_running() {
-    vncserver -list | grep -q '^:1'
-}
-
-start() {
-    if ! is_running; then
-        vncserver
-    else
-        error "The VNC server is already running!" 4
-    fi
-}
-
-status() {
-    log_f="${file_base}log"
-    if is_running; then
-        tail -f "$log_f"
-    else
-        echo "The VNC server is not running."
-    fi
-}
-
-stop() {
-    if is_running; then
-        vncserver -kill :1
-    else
-        error "The VNC server is not running!" 3
-    fi
-}
-
-# Argument parsing
-set -e; trap 'set +e; error "$error" "$?"' EXIT
-error="You must give an argument"
-[ -n "$1" ]; arg="$1"; shift
-unset error
-set +e; trap - EXIT
-
-
-# Main case statement
-case "$arg" in
-    start|status|stop|help)
-        "$arg"
-        ;;
-    *)
-        usage "Invalid argument \"$arg\""
         ;;
 esac
 
+# Command building
+[[ -n $sudo ]] && vncctl+=("$sudo")
+vncctl+=(
+    "$systemctl"
+    "$@"
+    "$verb"
+    "${systemd_unit}@:${display}"
+)
+
+# Debug
+#echo "${vncctl[@]}"
+#exit 0
+
+# Command execution
+set -xe
+"${vncctl[@]}"
+

bin/xstartup.turbovnc

@@ -1,4 +0,0 @@
-#!/bin/sh
-artix-pipewire-loader &
-exec xfwm4
-