From a11938e54204425d57e9cd1d8c18d692020c11a2 Mon Sep 17 00:00:00 2001
From: Ben Reaves <rbreaves@gmail.com>
Date: Tue, 13 Aug 2019 11:47:25 -0500
Subject: [PATCH 1/2] - Corrected chromebook and mac keymap references,
 mac_term is not currently ready for active use for master or dev.

---
 chromebook.sh      | 2 +-
 keyswap_service.sh | 1 +
 mac_only.sh        | 2 +-
 mac_wordwise.sh    | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/chromebook.sh b/chromebook.sh
index 637f3f6..3bd9c51 100755
--- a/chromebook.sh
+++ b/chromebook.sh
@@ -13,4 +13,4 @@ line=$(cat ~/.xkb/keymap/kbd.chromebook.gui | grep -n 'xkb_types' | cut -f1 -d:)
 sed -ie "${line}s/\"/+mac_gui(addmac_levels)\"/2" ~/.xkb/keymap/kbd.chromebook.gui
 sleep 1
 line=$(cat ~/.xkb/keymap/kbd.chromebook.term | grep -n 'xkb_symbols' | cut -f1 -d:)
-sed -ie "${line}s/\"/+altwin(swap_alt_win)+mac_gui(mac_levelssym)\"/2" ~/.xkb/keymap/kbd.chromebook.term
+sed -ie "${line}s/\"/+altwin(swap_alt_win)\"/2" ~/.xkb/keymap/kbd.chromebook.term
diff --git a/keyswap_service.sh b/keyswap_service.sh
index 0506103..12900d4 100755
--- a/keyswap_service.sh
+++ b/keyswap_service.sh
@@ -11,6 +11,7 @@ chromeswap=$6
 if [[ "$swapbehavior" == "1" ]]; then
 	swapcmd="\/bin\/bash\ \/home\/`whoami`\/.config\/xactive.sh\ ${systemtype}\ ${internalid}\ ${usbid}\ ${chromeswap}"
 	mkdir -p ~/.config/systemd/user
+	mkdir -p ~/.config/autostart
 	cp ./system-config/keyswap.service ~/.config/systemd/user/keyswap.service
 	cp ./system-config/keyswap.sh ~/.config/autostart/keyswap.sh
 	cp ./system-config/xactive.sh ~/.config/xactive.sh
diff --git a/mac_only.sh b/mac_only.sh
index bb6668f..e10aead 100755
--- a/mac_only.sh
+++ b/mac_only.sh
@@ -12,4 +12,4 @@ line=$(cat ~/.xkb/keymap/kbd.mac.gui | grep -n 'xkb_types' | cut -f1 -d:)
 sed -ie "${line}s/\"/+mac_gui(addmac_levels)\"/2" ~/.xkb/keymap/kbd.mac.gui
 sleep 1
 line=$(cat ~/.xkb/keymap/kbd.mac.term | grep -n 'xkb_symbols' | cut -f1 -d:)
-sed -ie "${line}s/\"/+altwin(alt_super_win)+mac_gui(mac_levelssym)\"/2" ~/.xkb/keymap/kbd.mac.term
+sed -ie "${line}s/\"/+altwin(alt_super_win)\"/2" ~/.xkb/keymap/kbd.mac.term
diff --git a/mac_wordwise.sh b/mac_wordwise.sh
index daad377..0ae1730 100755
--- a/mac_wordwise.sh
+++ b/mac_wordwise.sh
@@ -12,4 +12,4 @@ line=$(cat ~/.xkb/keymap/kbd.mac.gui | grep -n 'xkb_types' | cut -f1 -d:)
 sed -ie "${line}s/\"/+mac_gui(addmac_levels)\"/2" ~/.xkb/keymap/kbd.mac.gui
 sleep 1
 line=$(cat ~/.xkb/keymap/kbd.mac.term | grep -n 'xkb_symbols' | cut -f1 -d:)
-sed -ie "${line}s/\"/+altwin(swap_alt_win)+mac_term(mac_levelssym)\"/2" ~/.xkb/keymap/kbd.mac.term
+sed -ie "${line}s/\"/+altwin(swap_alt_win)\"/2" ~/.xkb/keymap/kbd.mac.term

From 3314a0c8bd9e8e5320fc2790d8868d7305de3029 Mon Sep 17 00:00:00 2001
From: Ben Reaves <rbreaves@gmail.com>
Date: Tue, 13 Aug 2019 11:59:19 -0500
Subject: [PATCH 2/2] - Corrected parsing error that would have prevented
 non-swapping keymap from working

---
 install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.py b/install.py
index 644eb4e..6852d03 100755
--- a/install.py
+++ b/install.py
@@ -91,7 +91,7 @@ def keyboard_detect():
     else:
         print("Setting up " + system_type + " keyswap inside your profiles ~/.Xsession file.")
         print("You can modify or remove the file if you want you want to remove the modification.")
-        keyswapcmd = '/bin/bash -c "./keyswap_service.sh 0 ' + cmdgui + '"'
+        keyswapcmd = '/bin/bash -c \'./keyswap_service.sh 0 ' + cmdgui + '\''
         subprocess.check_output(keyswapcmd, shell=True).decode('utf-8')
 
     if system_type == "mac":