From 3c97a6904fa30d38a2c9e69f69b3a0a612e0a318 Mon Sep 17 00:00:00 2001 From: Ali Borhani Date: Thu, 16 Jul 2020 12:45:30 +0430 Subject: [PATCH 1/3] Use -S flag for /usr/bin/env MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Because of using `-O` flag for `python3.7` binary, it returns the below error: ``` $ ./bombsquad_server /usr/bin/env: ‘python3.7 -O’: No such file or directory /usr/bin/env: use -[v]S to pass options in shebang lines ``` --- tools/batools/pcommand.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/batools/pcommand.py b/tools/batools/pcommand.py index 9a848be5..b9248d75 100644 --- a/tools/batools/pcommand.py +++ b/tools/batools/pcommand.py @@ -62,7 +62,7 @@ def stage_server_file() -> None: lines = infile.read().splitlines() if mode == 'release': lines[0] = replace_one(lines[0], '#!/usr/bin/env python3.7', - '#!/usr/bin/env python3.7 -O') + '#!/usr/bin/env -S python3.7 -O') with open(outfilename, 'w') as outfile: outfile.write('\n'.join(lines) + '\n') subprocess.run(['chmod', '+x', outfilename], check=True) From b8832e61ea0eb0d5e2aabe63132ed9adc12e589e Mon Sep 17 00:00:00 2001 From: Ali Borhani Date: Thu, 16 Jul 2020 12:56:01 +0430 Subject: [PATCH 2/3] Add myself to CONTRIBUTORS.md --- CONTRIBUTORS.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 7a0a5ed2..226a1795 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -14,3 +14,6 @@ ### Benefit-Zebra - Unofficial BombSquad Bug Finder - Code Cleanup + +### Ali Borhani +- Bug fixes From 208ff00a769b2832cf2c24ae82c642bb8e45834a Mon Sep 17 00:00:00 2001 From: Ali Borhani Date: Thu, 16 Jul 2020 12:59:21 +0430 Subject: [PATCH 3/3] Add new changelog entry for using `-S` flag --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a4cb989..04624cb2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +### Unreleased +- Fixed the shebang line in `bombsquad_server` file by using `-S` flag for `/usr/bin/env`. + ### 1.5.22 (20139) - Button and key names now display correctly again on Android (and are cleaned up on other platforms too).