Merge pull request #133 from WhitewaterFoundry/development

Fix start menu shortcuts with systemd
WhitewaterFoundry · Oct 18, 2022 · 2f4636d · 2f4636d
2 parents bfc5e14 + e6ae366
commit 2f4636d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/bin/start-systemd b/bin/start-systemd
@@ -18,6 +18,7 @@ function setup_interop() {
 # Globals:
 #   HOME
 #   PATH
+#   PENGWIN_COMMAND
 #   PENGWIN_REMOTE_DESKTOP
 #   PULSE_SERVER
 #   SUDO_USER
@@ -106,6 +107,7 @@ function main() {
       echo "WSL_INTEROP='${WSL_INTEROP}'"
       echo "WSL_SYSTEMD_EXECUTION_ARGS='${WSL_SYSTEMD_EXECUTION_ARGS}'"
       echo "PULSE_SERVER='${PULSE_SERVER}'"
+      echo "PENGWIN_COMMAND='${PENGWIN_COMMAND}'"
       echo "PENGWIN_REMOTE_DESKTOP='${PENGWIN_REMOTE_DESKTOP}'"
     } >"${sudo_user_home}/${systemd_environment}"
     chown "${SUDO_USER}:${SUDO_USER}" "${sudo_user_home}/${systemd_environment}"

diff --git a/profile.d/00-pengwin.sh b/profile.d/00-pengwin.sh
@@ -8,6 +8,7 @@ save_environment() {
     echo "WSL_INTEROP='$WSL_INTEROP'"
     echo "WSL_SYSTEMD_EXECUTION_ARGS='$WSL_SYSTEMD_EXECUTION_ARGS'"
     echo "PULSE_SERVER='$PULSE_SERVER'"
+    echo "PENGWIN_COMMAND='$PENGWIN_COMMAND'"
     echo "PENGWIN_REMOTE_DESKTOP='$PENGWIN_REMOTE_DESKTOP'"
   } >"${systemd_saved_environment}"
 }

diff --git a/profile.d/99-start-command.sh b/profile.d/99-start-command.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+# bashsupport disable=BP5007
+
+if [ -z "${PENGWIN_COMMAND}" ]; then
+  return
+fi
+set -x
+echo "${PENGWIN_COMMAND}"
+
+saved_param="${PENGWIN_COMMAND}"
+unset PENGWIN_COMMAND
+set +x
+if [ -n "${saved_param}" ]; then
+  eval ${saved_param}
+
+  unset saved_param
+fi