X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=autorandr.py;h=8d561fd85874d1b1d50499344744119715744f53;hb=a02f2f6968167170cc335f9dc39d06b91aa15027;hp=5082ebd08d6489e3d092766ec463dbb189af9ef7;hpb=f171c8a5ad91dd586320d89c504c316d18f3d056;p=deb_pkgs%2Fautorandr.git diff --git a/autorandr.py b/autorandr.py index 5082ebd..8d561fd 100755 --- a/autorandr.py +++ b/autorandr.py @@ -843,6 +843,9 @@ def dispatch_call_to_sessions(argv): process_environ[name] = value display = process_environ["DISPLAY"] if "DISPLAY" in process_environ else None + # To allow scripts to detect batch invocation (especially useful for predetect) + process_environ["AUTORANDR_BATCH_PID"] = str(os.getpid()) + if display and display not in X11_displays_done: try: pwent = pwd.getpwuid(uid) @@ -878,6 +881,9 @@ def main(argv): file=sys.stderr) sys.exit(posix.EX_USAGE) + if "-h" in options or "--help" in options: + exit_help() + # Batch mode if "--batch" in options: if ("DISPLAY" not in os.environ or not os.environ["DISPLAY"]) and os.getuid() == 0: @@ -972,9 +978,6 @@ def main(argv): raise AutorandrException("Failed to remove profile '%s'" % (options["--remove"],), e) sys.exit(0) - if "-h" in options or "--help" in options: - exit_help() - detected_profiles = find_profiles(config, profiles) load_profile = False