Fix detection of xprop on systems with older xprop

Fixes #798
This commit is contained in:
Kovid Goyal 2018-08-08 15:31:15 +05:30
parent a92b20f85a
commit 59f39ae3ab
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C

View File

@ -2,12 +2,12 @@
# vim:fileencoding=utf-8 # vim:fileencoding=utf-8
# License: GPL v3 Copyright: 2018, Kovid Goyal <kovid at kovidgoyal.net> # License: GPL v3 Copyright: 2018, Kovid Goyal <kovid at kovidgoyal.net>
import shutil
import subprocess import subprocess
import sys import sys
from kitty.constants import is_macos, is_wayland
from kitty.cli import parse_args from kitty.cli import parse_args
from kitty.constants import is_macos, is_wayland
OPTIONS = r''' OPTIONS = r'''
--lines --lines
@ -123,7 +123,8 @@ def main(sys_args):
global args global args
if is_macos or is_wayland: if is_macos or is_wayland:
raise SystemExit('Currently the panel kitten is supported only on X11 desktops') raise SystemExit('Currently the panel kitten is supported only on X11 desktops')
call_xprop('-version', silent=True) # ensure xprop is available if not shutil.which('xprop'):
raise SystemExit('The xprop program is required for the panel kitten')
args, items = parse_panel_args(sys_args[1:]) args, items = parse_panel_args(sys_args[1:])
if not items: if not items:
raise SystemExit('You must specify the program to run') raise SystemExit('You must specify the program to run')