diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-03-18 23:28:00 +0200 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-03-18 23:28:00 +0200 |
commit | 2e73994978102cf4eb09ecbe21c41bbf96966724 (patch) | |
tree | ba7cbb1a1a4fceb749cac47f97a07d76bad6f7a4 | |
parent | 7844fd54d9d12e009e4fad9f023df618d6af3e1e (diff) | |
parent | d5c9b98cab5aba89ac7ba184b56f1b9d00bd6d24 (diff) | |
download | meson-2e73994978102cf4eb09ecbe21c41bbf96966724.zip meson-2e73994978102cf4eb09ecbe21c41bbf96966724.tar.gz meson-2e73994978102cf4eb09ecbe21c41bbf96966724.tar.bz2 |
Merge pull request #455 from nirbheek/meson_install_shebang_parsing
meson_install.py: Start by checking if the shebang is directly runnable
-rw-r--r-- | mesonbuild/scripts/meson_install.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/mesonbuild/scripts/meson_install.py b/mesonbuild/scripts/meson_install.py index 792af6c..8e3d0ca 100644 --- a/mesonbuild/scripts/meson_install.py +++ b/mesonbuild/scripts/meson_install.py @@ -118,10 +118,14 @@ def run_install_script(d): if platform.system().lower() == 'windows' and suffix != '.bat': first_line = open(script).readline().strip() if first_line.startswith('#!'): - commands = first_line[2:].split('#')[0].strip().split() - commands[0] = shutil.which(commands[0].split('/')[-1]) - if commands[0] is None: - raise RuntimeError("Don't know how to run script %s." % script) + if shutil.which(first_line[2:]): + commands = [first_line[2:]] + else: + commands = first_line[2:].split('#')[0].strip().split() + commands[0] = shutil.which(commands[0].split('/')[-1]) + if commands[0] is None: + commands + raise RuntimeError("Don't know how to run script %s." % script) final_command = commands + [script] + i.cmd_arr[1:] else: final_command = i.cmd_arr @@ -129,8 +133,8 @@ def run_install_script(d): rc = subprocess.call(final_command, env=child_env) if rc != 0: sys.exit(rc) - except Exception: - print('Failed to run install script:', i.cmd_arr[0]) + except: + print('Failed to run install script:', *i.cmd_arr) sys.exit(1) def is_elf_platform(): |