From 9060cffbff44ca63a0961630b52af4d2040576f4 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Fri, 21 Feb 2020 23:40:28 -0600 Subject: [PATCH] - Added Support for Manjaro and Arch distros using pacman --- defaults.json | 4 ++-- setup.py | 18 ++++++++++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/defaults.json b/defaults.json index bad2ec2..f22e501 100644 --- a/defaults.json +++ b/defaults.json @@ -18,7 +18,7 @@ }, { "id": 2, - "name":"Mac - hid driver", + "name":"Mac - hid driver (Recommended - Also supports Windows keyboards)", "type":"mac", "active": false, "description":"Standard Mac Keyboards with Apple driver", @@ -32,7 +32,7 @@ }, { "id": 3, - "name":"Mac Only", + "name":"Mac Only (VMs & non-official Apple keyboards)", "type":"mac", "active": true, "description":"Standard Mac Keyboards", diff --git a/setup.py b/setup.py index 34a49da..8cd370e 100755 --- a/setup.py +++ b/setup.py @@ -17,10 +17,10 @@ def cmdline(command): def requirements(pkgm): print(bcolors.CYELLOW + "You need to install some packages, " +run_pkg+ ", for Kinto to fully remap browsers during input focus.\n" + bcolors.ENDC) - print("sudo apt-get install -y " + run_pkg + "\n") + print("sudo " + pkgm + " " + run_pkg + "\n") run_install = yn_choice(bcolors.CYELLOW + "Would you like to run it now? (Will require sudo privileges.)\n" + bcolors.ENDC) if(run_install): - os.system("sudo " + pkgm + " install -y " + run_pkg) + os.system("sudo " + pkgm + run_pkg) print("\n") def install_ibus(): @@ -41,10 +41,24 @@ if len(check_x11) == 0: check_xbind = cmdline("which xbindkeys 2>/dev/null").strip() check_xdotool = cmdline("which xdotool 2>/dev/null").strip() + pkgm = cmdline("which apt 2>/dev/null").strip() if len(pkgm) == 0: pkgm = cmdline("which dnf 2>/dev/null").strip() + if len(pkgm) > 0: + pkgm += " install -y " +else: + pkgm += " install -y " + +if len(pkgm) == 0: + pkgm = cmdline("which pacman 2>/dev/null").strip() + if len(pkgm) > 0: + pkgm += " -S " +else: + print("hello") + + if len(pkgm) == 0: print("No supported package manager found. Exiting...") sys.exit()