From 868e0476f0dc31a0b152c004e26377a569a8406b Mon Sep 17 00:00:00 2001
From: Hippolyte Chauvin <hchauvin38@outlook.fr>
Date: Tue, 24 Oct 2023 11:24:43 +0200
Subject: [PATCH] Refactoring des scripts des lancements d'environnements

---
 bin/Hyprland | 14 +++++++++-----
 bin/sway     | 13 +++++++++----
 vnc/xstartup | 12 +++++++++---
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/bin/Hyprland b/bin/Hyprland
index 133832b..c146bff 100755
--- a/bin/Hyprland
+++ b/bin/Hyprland
@@ -3,12 +3,16 @@
 # cd to home
 cd
 
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
+    exec dbus-launch --exit-with-session "$0" "$@"
+fi
+
+if [ -z "$SSH_AGENT_PID" ]; then
+    exec ssh-agent "$0" "$@"
+fi
+
 # XDG
 export XDG_CONFIG_HOME="${HOME}/.config"
 
 # Execution
-exec ssh-agent \
-    dbus-launch --exit-with-session \
-    /usr/bin/Hyprland \
-    "$@"
-
+exec /usr/bin/Hyprland "$@"
diff --git a/bin/sway b/bin/sway
index 851e2f7..15dbd84 100755
--- a/bin/sway
+++ b/bin/sway
@@ -1,8 +1,15 @@
 #!/bin/sh -xe
 
-# cd
 cd
 
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
+    exec dbus-launch --exit-with-session "$0" "$@"
+fi
+
+if [ -z "$SSH_AGENT_PID" ]; then
+    exec ssh-agent "$0" "$@"
+fi
+
 # Environment
 # XDG
 export \
@@ -19,6 +26,4 @@ export \
 	MOZ_ENABLE_WAYLAND=1
 
 # Execution
-exec dbus-launch --exit-with-session \
-	ssh-agent /usr/bin/sway "$@"
-
+exec /usr/bin/sway "$@"
diff --git a/vnc/xstartup b/vnc/xstartup
index 87cb8c1..68160a5 100755
--- a/vnc/xstartup
+++ b/vnc/xstartup
@@ -1,10 +1,16 @@
-#!/bin/sh
+#!/bin/sh -xe
+
+cd
+
 if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
     exec dbus-launch --exit-with-session ssh-agent "$0" "$@"
 fi
 
-cd
+if [ -z "$SSH_AGENT_PID" ]; then
+    exec ssh-agent "$0" "$@"
+fi
+
 xfwm4 &
-artix-pipewire-launcher &
+artix-pipewire-launcher restart &
 alacritty
 wait