From 0e23aae082c1d548eccba35fdfde072a6fca2e9a Mon Sep 17 00:00:00 2001 From: Ryan Reaves Date: Tue, 25 Feb 2020 15:22:48 -0600 Subject: [PATCH] - Updated installer to check for x11 more reliably --- setup.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 8cd370e..d6c2db5 100755 --- a/setup.py +++ b/setup.py @@ -33,7 +33,8 @@ def install_ibus(): input("IBus has been set as the default Input Method.\nPress any key to exit and re-run after logoff & logon...") sys.exit() -check_x11 = cmdline("env | grep -i x11").strip() +# check_x11 = cmdline("env | grep -i x11").strip() +check_x11 = cmdline("loginctl show-session \"$XDG_SESSION_ID\" -p Type | awk -F= '{print $2}'").strip() if len(check_x11) == 0: print("You are not using x11, please logout and back in using x11/Xorg") @@ -55,8 +56,6 @@ 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: