From d662ef817b4a452e96eda3e12d49e8a9e658e8e5 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 29 Nov 2012 20:49:47 +0000 Subject: [PATCH] Don't hack_xinitrc if system xinitrc doesn't exist. --- zenmap/install_scripts/macosx/zenmap_wrapper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zenmap/install_scripts/macosx/zenmap_wrapper.py b/zenmap/install_scripts/macosx/zenmap_wrapper.py index b659ef69f..adc629cf9 100755 --- a/zenmap/install_scripts/macosx/zenmap_wrapper.py +++ b/zenmap/install_scripts/macosx/zenmap_wrapper.py @@ -108,7 +108,7 @@ def start_x11(): return system_xinitrc_filename = "/usr/X11R6/lib/X11/xinit/xinitrc" home_xinitrc_filename = os.path.join(HOME, ".xinitrc") - if not os.path.exists(home_xinitrc_filename): + if os.path.exists(system_xinitrc_filename) and not os.path.exists(home_xinitrc_filename): hack_xinitrc(system_xinitrc_filename, home_xinitrc_filename) os.system("open -a X11") os.environ["DISPLAY"] = ":0"