From a1ad1aee998c6fa7f51a4a25de1f693cbb173926 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Sat, 23 May 2020 20:07:23 +0200 Subject: [PATCH] Use "python2" instead of "python". --- src/p_lx_sh.cpp | 2 +- src/stub/Makefile | 2 +- src/stub/scripts/bin2h.py | 2 +- src/stub/scripts/brandelf.py | 2 +- src/stub/scripts/gpp_inc.py | 2 +- src/stub/scripts/xstrip.py | 2 +- src/stub/src/arch/i086/cleanasm.py | 2 +- src/stub/src/arch/i086/wdis2gas.py | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/p_lx_sh.cpp b/src/p_lx_sh.cpp index 70e6fdc3..30c60dcc 100644 --- a/src/p_lx_sh.cpp +++ b/src/p_lx_sh.cpp @@ -114,7 +114,7 @@ bool PackLinuxI386sh::getShellName(char *buf) buf[l_shname] = 0; static char const *const shname[] = { // known shells that accept "-c" arg "ash", "bash", "bsh", "csh", "ksh", "pdksh", "sh", "tcsh", "zsh", - "python", + "python", "python2", "python3", NULL }; const char *bname = strrchr(buf, '/'); diff --git a/src/stub/Makefile b/src/stub/Makefile index 0add5541..134e0b2c 100644 --- a/src/stub/Makefile +++ b/src/stub/Makefile @@ -206,7 +206,7 @@ tc_objdump_disasm_options = ECHO_e = /bin/echo -e ECHO_E = /bin/echo -E PERL = perl -PYTHON = python +PYTHON = python2 UNIX2DOS := $(PERL) -i -pe 's/$$/\r/;' # trim (strip) trailing whitespace diff --git a/src/stub/scripts/bin2h.py b/src/stub/scripts/bin2h.py index d47e73d5..b30e3c89 100644 --- a/src/stub/scripts/bin2h.py +++ b/src/stub/scripts/bin2h.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python2 ## vim:set ts=4 sw=4 et: -*- coding: utf-8 -*- # # bin2h.py -- diff --git a/src/stub/scripts/brandelf.py b/src/stub/scripts/brandelf.py index 508ee5f2..bcafb111 100644 --- a/src/stub/scripts/brandelf.py +++ b/src/stub/scripts/brandelf.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python2 ## vim:set ts=4 sw=4 et: -*- coding: utf-8 -*- # # brandelf.py -- diff --git a/src/stub/scripts/gpp_inc.py b/src/stub/scripts/gpp_inc.py index f183fa51..3c0a9083 100644 --- a/src/stub/scripts/gpp_inc.py +++ b/src/stub/scripts/gpp_inc.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python2 ## vim:set ts=4 sw=4 et: -*- coding: utf-8 -*- # # gpp_inc.py -- Generic PreProcessor: include diff --git a/src/stub/scripts/xstrip.py b/src/stub/scripts/xstrip.py index 29d2169f..2d8c07c3 100644 --- a/src/stub/scripts/xstrip.py +++ b/src/stub/scripts/xstrip.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python2 ## vim:set ts=4 sw=4 et: -*- coding: utf-8 -*- # # xstrip.py -- truncate ELF objects created by multiarch-objcopy-2.17 diff --git a/src/stub/src/arch/i086/cleanasm.py b/src/stub/src/arch/i086/cleanasm.py index c10f2f87..605b4db4 100644 --- a/src/stub/src/arch/i086/cleanasm.py +++ b/src/stub/src/arch/i086/cleanasm.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python2 ## vim:set ts=4 sw=4 et: -*- coding: utf-8 -*- # # cleanasm.py -- diff --git a/src/stub/src/arch/i086/wdis2gas.py b/src/stub/src/arch/i086/wdis2gas.py index b0a377d8..e99c7530 100644 --- a/src/stub/src/arch/i086/wdis2gas.py +++ b/src/stub/src/arch/i086/wdis2gas.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python2 ## vim:set ts=4 sw=4 et: -*- coding: utf-8 -*- # # wdis2gas.py --