From 7c74dcca7101bf91e366af03e8c43ddd6ef6b87f Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Mon, 9 Mar 2020 11:53:30 -0500 Subject: [PATCH] - Added package install of ibus for manjaro --- setup.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index 442a593..dc4d2c7 100755 --- a/setup.py +++ b/setup.py @@ -45,20 +45,21 @@ if len(check_x11) == 0: check_xbind = cmdline("which xbindkeys 2>/dev/null").strip() check_xdotool = cmdline("which xdotool 2>/dev/null").strip() +check_ibus = cmdline("which ibus-setup 2>/dev/null").strip() -pkgm = cmdline("which apt 2>/dev/null").strip() +pkgm = cmdline("which apt-get 2>/dev/null").strip() if len(pkgm) == 0: pkgm = cmdline("which dnf 2>/dev/null").strip() if len(pkgm) > 0: - pkgm += " install -y " + pkgm += " check-update;sudo dnf install -y " else: - pkgm += " install -y " + pkgm += " update; sudo apt-get install -y " if len(pkgm) == 0: pkgm = cmdline("which pacman 2>/dev/null").strip() if len(pkgm) > 0: - pkgm += " -S " + pkgm += " -Syy; sudo pacman -S " if len(pkgm) == 0: @@ -69,14 +70,18 @@ if len(pkgm) == 0: runpkg = 0 run_pkg = "" -if len(check_xbind) > 0 and len(check_xdotool) > 0: - print("Xbindkeys, and xdotool requirement is installed.") +if len(check_xbind) > 0 and len(check_xdotool) > 0 and len(check_ibus) > 0: + print("Xbindkeys, xdotool and IBus requirement is installed.") if len(check_xbind) == 0: run_pkg = "xbindkeys" runpkg = 1 if len(check_xdotool) == 0: run_pkg += " xdotool" runpkg = 1 +if len(check_ibus) == 0: + # may differ with distro, but for now + run_pkg += " ibus" + runpkg = 1 if runpkg != 0: requirements(pkgm)