From 94595a3324015f4fff3c4866cad551e921052163 Mon Sep 17 00:00:00 2001
From: Ben Reaves <rbreaves@gmail.com>
Date: Wed, 11 Nov 2020 14:17:40 -0600
Subject: [PATCH] - Relocated limitedadmins as well for #311, will add check
 later

---
 xkeysnail_service.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/xkeysnail_service.sh b/xkeysnail_service.sh
index 695888c..7a077fe 100755
--- a/xkeysnail_service.sh
+++ b/xkeysnail_service.sh
@@ -403,8 +403,6 @@ sed -i "s#{xhost}#`\\which xhost`#g" ./xkeysnail-config/xkeysnail.service.new
 sed -i "s/{username}/`whoami`/g" ./xkeysnail-config/limitedadmins.new
 sed -i "s#{systemctl}#`\\which systemctl`#g" ./xkeysnail-config/limitedadmins.new
 sed -i "s#{pkill}#`\\which pkill`#g" ./xkeysnail-config/limitedadmins.new
-sudo chown root:root ./xkeysnail-config/limitedadmins.new
-sudo mv ./xkeysnail-config/limitedadmins.new /etc/sudoers.d/limitedadmins
 sed -i "s#{systemctl}#`\\which systemctl`#g" ~/.config/kinto/xkeysnail.desktop
 sed -i "s#{xhost}#`\\which xhost`#g" ~/.config/kinto/xkeysnail.desktop
 sed -i "s#{homedir}#`echo "$HOME"`#g" ~/.config/kinto/xkeysnail.desktop
@@ -481,6 +479,9 @@ if ! [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
 	sed -i "s#{xkeysnail}#`which xkeysnail`#g" ./xkeysnail-config/xkeysnail.service.new
 	sed -i "s#{xkeysnail}#`which xkeysnail`#g" ./xkeysnail-config/limitedadmins.new
 	sudo mv ./xkeysnail-config/xkeysnail.service.new "$xkeypath"xkeysnail.service && echo "Service file added to "$xkeypath"xkeysnail.service"
+	sudo chown root:root ./xkeysnail-config/limitedadmins.new
+	# Add a check here for xkeysnail path resolving
+	sudo mv ./xkeysnail-config/limitedadmins.new /etc/sudoers.d/limitedadmins
 	sudo chown -R root:root "$xkeypath"xkeysnail.service && echo "Ownership set for root..." || echo "Failed to set ownership..."
 	sudo chmod 644 "$xkeypath"xkeysnail.service && echo "Permissions set to 644..." || echo "Failed to set permissions..."
 	sudo ln -s "$xkeypath"xkeysnail.service /etc/systemd/system/xkeysnail.service && echo "Created soft symlink..." || echo "Failed to create soft symlink..."