1Let us override the hashbang directly (possibly upstreamable), and don't 2play games with hashbangs: for now assume that even hashbangs with spaces 3are simple (assume the spaces are only used to separate arguments) and 4we don't have long hashbangs. 5 6Upstream-Status: Inappropriate 7Signed-off-by: Ross Burton <ross.burton@arm.com> 8 9diff --git a/src/installer/__main__.py b/src/installer/__main__.py 10index 3357ec5..d2fd8d2 100644 11--- a/src/installer/__main__.py 12+++ b/src/installer/__main__.py 13@@ -23,6 +23,13 @@ def _get_main_parser() -> argparse.ArgumentParser: 14 type=str, 15 help="destination directory (prefix to prepend to each file)", 16 ) 17+ parser.add_argument( 18+ "--interpreter", 19+ "-i", 20+ type=str, 21+ default=sys.executable, 22+ help=f"interpreter (defaults to {sys.executable})", 23+ ) 24 parser.add_argument( 25 "--compile-bytecode", 26 action="append", 27@@ -73,7 +80,7 @@ def _main(cli_args: Sequence[str], program: Optional[str] = None) -> None: 28 with WheelFile.open(args.wheel) as source: 29 destination = SchemeDictionaryDestination( 30 scheme_dict=_get_scheme_dict(source.distribution), 31- interpreter=sys.executable, 32+ interpreter=args.interpreter, 33 script_kind=get_launcher_kind(), 34 bytecode_optimization_levels=bytecode_levels, 35 destdir=args.destdir, 36diff --git a/src/installer/scripts.py b/src/installer/scripts.py 37index 7e3c8fc..ba6ed5a 100644 38--- a/src/installer/scripts.py 39+++ b/src/installer/scripts.py 40@@ -59,20 +59,7 @@ def _build_shebang(executable: str, forlauncher: bool) -> bytes: 41 https://bitbucket.org/pypa/distlib/src/58cd5c6/distlib/scripts.py#lines-124 42 """ 43 executable_bytes = executable.encode("utf-8") 44- if forlauncher: # The launcher can just use the command as-is. 45- return b"#!" + executable_bytes 46- if _is_executable_simple(executable_bytes): 47- return b"#!" + executable_bytes 48- 49- # Shebang support for an executable with a space in it is under-specified 50- # and platform-dependent, so we use a clever hack to generate a script to 51- # run in ``/bin/sh`` that should work on all reasonably modern platforms. 52- # Read the following message to understand how the hack works: 53- # https://github.com/pradyunsg/installer/pull/4#issuecomment-623668717 54- 55- quoted = shlex.quote(executable).encode("utf-8") 56- # I don't understand a lick what this is trying to do. 57- return b"#!/bin/sh\n'''exec' " + quoted + b' "$0" "$@"\n' + b"' '''" 58+ return b"#!" + executable_bytes 59 60 61 class InvalidScript(ValueError): 62