From 099b3cea8836cf90772a11466d27c15899ce2fe2 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Thu, 7 May 2020 12:56:56 -0500 Subject: [PATCH] - Fixed Uninstaller to better location and improved it. Closes #154 --- setup.py | 20 +++++++++++++++++++- uninstall.sh | 5 +++-- xkeysnail_service.sh | 6 +++++- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 2c94422..e12d352 100755 --- a/setup.py +++ b/setup.py @@ -70,6 +70,7 @@ def setShortcuts(): cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-applications-backward \"['F14','F14','Tab']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['h','F9']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") + cmdline("gsettings set org.gnome.mutter overlay-key ''") if distro == "ubuntu" and dename == "gnome": cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-up \"['Up','Left']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-down \"['Down','Right']\"") @@ -251,6 +252,10 @@ def Uninstall(): cmdline("gsettings reset-recursively org.gnome.desktop.wm.keybindings") print("gsettings reset-recursively org.gnome.mutter.keybindings") cmdline("gsettings reset-recursively org.gnome.mutter.keybindings") + print("gsettings set org.gnome.mutter overlay-key 'super'") + cmdline("gsettings set org.gnome.mutter overlay-key 'super'") + cmdline('dconf dump /org/gnome/mutter/ > mutter.conf') + cmdline('dconf load /org/gnome/mutter/ < mutter.conf') elif dename == "kde": print("Resetting DE hotkeys...\n") cmdline('mv ~/.config/kwinrc ~/.config/kwinrc.kinto') @@ -357,7 +362,12 @@ color_arr = [bcolors.CBEIGE,bcolors.CRED2,bcolors.CGREEN,bcolors.CYELLOW ] print("\nKinto - Type in Linux like it's a Mac.\n") -kintotype = int(input(color_arr[2] + "1) Kinto - xkeysnail (udev/x11) - Recommended\n" + color_arr[0] + "2) Kinto - Original xkb/x11 implementation\n\n" + bcolors.ENDC)) +kintotype = int(input(color_arr[2] + + "1) Kinto - xkeysnail (udev/x11) - Recommended\n" + color_arr[0] + + "2) Kinto - Original xkb/x11 implementation\n" + color_arr[3] + + "3) Uninstall Kinto - xkeysnail\n" + + "4) Uninstall Kinto - Original xkb\n\n" + + bcolors.ENDC)) print("") if(kintotype == 1): subprocess.check_call(shlex.split("./xkeysnail_service.sh")) @@ -365,6 +375,14 @@ if(kintotype == 1): setShortcuts() exit() +if(kintotype == 3): + subprocess.check_call(shlex.split("./xkeysnail_service.sh uninstall")) + exit() + +if(kintotype == 4): + Uninstall() + exit() + for index, item in enumerate(data['defaulttypes']): ossym = "" if item == "windows": diff --git a/uninstall.sh b/uninstall.sh index 6a62058..3cd3d63 100755 --- a/uninstall.sh +++ b/uninstall.sh @@ -14,5 +14,6 @@ rm ~/.config/systemd/user/keyswap.timer rm -rf ~/.config/autostart/kinto.desktop rm -rf ~/.config/kinto rm -rf ~/.xkb -systemctl daemon-reload -sed -i '/xkb/d' ~/.Xsession 2>/dev/null \ No newline at end of file +sudo systemctl daemon-reload +sed -i '/xkb/d' ~/.Xsession 2>/dev/null +exit 0 \ No newline at end of file diff --git a/xkeysnail_service.sh b/xkeysnail_service.sh index e9ea046..5b67424 100755 --- a/xkeysnail_service.sh +++ b/xkeysnail_service.sh @@ -27,6 +27,10 @@ function uninstall { gsettings reset-recursively org.gnome.desktop.wm.keybindings echo "gsettings reset-recursively org.gnome.mutter.keybindings" gsettings reset-recursively org.gnome.mutter.keybindings + echo "gsettings set org.gnome.mutter overlay-key 'super'" + gsettings set org.gnome.mutter overlay-key 'super' + dconf dump /org/gnome/mutter/ > mutter.conf + dconf load /org/gnome/mutter/ < mutter.conf elif [ "$dename" == "kde" ];then echo "Resetting DE hotkeys..." mv ~/.config/kwinrc ~/.config/kwinrc.kinto @@ -73,7 +77,7 @@ if [ $# -eq 0 ]; then echo " 1) Windows & Mac (HID driver)" echo " 2) Mac Only & VMs on Macbooks" echo " 3) Chromebook" - echo " 4) Uninstall" + # echo " 4) Uninstall" read n