From c8cac2a2c1b42fde675b166272729c74c2c42cdc Mon Sep 17 00:00:00 2001 From: Joshua Nelson Date: Fri, 1 Jan 2021 11:52:31 -0500 Subject: [PATCH] Choose the version of python at runtime (portable version) - Try `py -3` first for windows compatibility - Fall back to `python3` if `py` doesn't work --- x.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/x.py b/x.py index 7973730ef17..4f64ea9fae8 100755 --- a/x.py +++ b/x.py @@ -4,6 +4,22 @@ import os import sys + +# If this is python2, check if python3 is available and re-execute with that +# interpreter. +if sys.version_info.major < 3: + try: + # On Windows, `py -3` sometimes works. + # Try this first, because 'python3' sometimes tries to launch the app + # store on Windows + os.execvp("py", ["py", "-3"] + sys.argv) + except OSError: + try: + os.execvp("python3", ["python3"] + sys.argv) + except OSError: + # Python 3 isn't available, fall back to python 2 + pass + rust_dir = os.path.dirname(os.path.abspath(__file__)) sys.path.append(os.path.join(rust_dir, "src", "bootstrap"))