From 0ab73a702e81f8a6790e43fc518ac508338f5b91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes@hkoerber.de>
Date: Fri, 28 Feb 2020 21:29:41 +0100
Subject: [PATCH] autostart: Refactor unit naming into function

---
 autostart.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/autostart.sh b/autostart.sh
index 3fc1e00..ef1cf88 100755
--- a/autostart.sh
+++ b/autostart.sh
@@ -27,6 +27,11 @@ do_run() {
     return $(( ! $run ))
 }
 
+get_unit_name() {
+    name="$1" ; shift
+    printf '%s' "${name}"
+}
+
 run_raw() {
     name="$1"
     shift
@@ -35,7 +40,7 @@ run_raw() {
 
     systemd-run \
         --user \
-        --unit "${name}" \
+        --unit "$(get_unit_name "${name}")" \
         --no-block \
         --remain-after-exit \
         --setenv=DISPLAY=${DISPLAY} \
@@ -76,7 +81,7 @@ schedule() {
     do_run "$name" || return
     systemd-run \
         --user \
-        --unit "${name}" \
+        --unit "$(get_unit_name "${name}")" \
         --no-block \
         --setenv=DISPLAY=${DISPLAY} \
         --on-calendar="${spec}" \