From f5d8327d9ae6655696f60acd7df2a288543e7d31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20N=C3=B6hrer?= Date: Sat, 18 Mar 2017 01:07:36 +0100 Subject: [PATCH] Fix hass script execution on Windows (#4977). (#6601) * Fix hass script execution on Windows (#4977). hass.exe returned ERRNO2 on a windows machine and must be started using package loading. This fix adapts the command line options for `setup_and_run_hass()` to start either a script with `python homeassistant/__main__.py` or with `Scripts/hass.exe` * Fix code style --- homeassistant/__main__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/homeassistant/__main__.py b/homeassistant/__main__.py index d9ab410b745..1d5da4e798f 100644 --- a/homeassistant/__main__.py +++ b/homeassistant/__main__.py @@ -255,10 +255,13 @@ def closefds_osx(min_fd: int, max_fd: int) -> None: def cmdline() -> List[str]: """Collect path and arguments to re-execute the current hass instance.""" - if sys.argv[0].endswith('/__main__.py'): + if sys.argv[0].endswith(os.path.sep + '__main__.py'): modulepath = os.path.dirname(sys.argv[0]) os.environ['PYTHONPATH'] = os.path.dirname(modulepath) - return [sys.executable] + [arg for arg in sys.argv if arg != '--daemon'] + return [sys.executable] + [arg for arg in sys.argv if + arg != '--daemon'] + else: + return [arg for arg in sys.argv if arg != '--daemon'] def setup_and_run_hass(config_dir: str,