From 930279ba9ebb825d09ba0f1f33df05493308ca96 Mon Sep 17 00:00:00 2001
From: Ryan Reaves <rbreaves@gmail.com>
Date: Mon, 29 Jul 2019 23:06:29 -0500
Subject: [PATCH] - Updated keyswap service template and added service.sh
 install script

---
 keyswap_service.sh            | 24 ++++++++++++++++++++++++
 system-config/keyswap.service |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 keyswap_service.sh

diff --git a/keyswap_service.sh b/keyswap_service.sh
new file mode 100644
index 0000000..560e451
--- /dev/null
+++ b/keyswap_service.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+swapbehavior=$1
+newparams=$2
+noswapcmd=$3
+
+if [[ "$swapbehavior" == "yes" ]]; then
+	swapcmd="/bin/bash /home/`whoami`/.config/xactive.sh $2"
+
+	cp ./system-config/keyswap.service ~/.config/systemd/user/keyswap.service
+	sed -i "s/{username}/${whoami}/g" ~/.config/systemd/user/keyswap.service
+	sed -i "s/ExecStart=/ExecStart=${swapcmd}/g" ~/.config/systemd/user/keyswap.service
+else
+	#/usr/bin/setxkbmap
+	#/usr/bin/xkbcomp
+	#echo $XDG_SESSION_TYPE
+	if [ ! -f "~/.Xsession" ]; then
+		echo "$noswapcmd" > ~/.Xsession
+	fi
+	grep "xkb" ~/.Xsession 1>/dev/null
+	if [ $? -eq 1 ]; then
+		echo "$noswapcmd" >> ~/.Xsession
+	fi
+fi
\ No newline at end of file
diff --git a/system-config/keyswap.service b/system-config/keyswap.service
index d76dca5..e4c8a42 100644
--- a/system-config/keyswap.service
+++ b/system-config/keyswap.service
@@ -9,7 +9,7 @@ Group={username}
 Environment=DISPLAY=:0
 Restart=always
 WorkingDirectory=/home/{username}/.config/
-ExecStart=/bin/bash /home/{username}/.config/xactive.sh {parameters}
+ExecStart=
 
 [Install]
 WantedBy=multi-user.target