1 |
From b3854bd9791bb21d7284ef6284a3fb7d4b585412 Mon Sep 17 00:00:00 2001 |
2 |
From: Sid Spry <github@××××××××.us> |
3 |
Date: Sun, 14 Jun 2020 23:29:46 -0500 |
4 |
Subject: [PATCH] Use env to find python |
5 |
To: gentoo-portage-dev@l.g.o |
6 |
|
7 |
--- |
8 |
bin/archive-conf | 2 +- |
9 |
bin/binhost-snapshot | 2 +- |
10 |
bin/check-implicit-pointer-usage.py | 2 +- |
11 |
bin/chmod-lite.py | 2 +- |
12 |
bin/chpathtool.py | 2 +- |
13 |
bin/clean_locks | 2 +- |
14 |
bin/dispatch-conf | 2 +- |
15 |
bin/dohtml.py | 2 +- |
16 |
bin/doins.py | 2 +- |
17 |
bin/ebuild | 2 +- |
18 |
bin/ebuild-ipc.py | 2 +- |
19 |
bin/egencache | 2 +- |
20 |
bin/emaint | 2 +- |
21 |
bin/emerge | 2 +- |
22 |
bin/emirrordist | 2 +- |
23 |
bin/env-update | 2 +- |
24 |
bin/filter-bash-environment.py | 2 +- |
25 |
bin/fixpackages | 2 +- |
26 |
bin/glsa-check | 2 +- |
27 |
bin/install.py | 2 +- |
28 |
bin/lock-helper.py | 2 +- |
29 |
bin/portageq | 2 +- |
30 |
bin/quickpkg | 2 +- |
31 |
bin/regenworld | 2 +- |
32 |
bin/xattr-helper.py | 2 +- |
33 |
bin/xpak-helper.py | 2 +- |
34 |
lib/portage/tests/runTests.py | 2 +- |
35 |
lib/portage/util/changelog.py | 2 +- |
36 |
runtests | 2 +- |
37 |
tabcheck.py | 2 +- |
38 |
30 files changed, 30 insertions(+), 30 deletions(-) |
39 |
|
40 |
diff --git a/bin/archive-conf b/bin/archive-conf |
41 |
index 8341ffe73..36a4da07a 100755 |
42 |
--- a/bin/archive-conf |
43 |
+++ b/bin/archive-conf |
44 |
@@ -1,4 +1,4 @@ |
45 |
-#!/usr/bin/python -b |
46 |
+#!/usr/bin/env -S python -b |
47 |
# Copyright 1999-2014 Gentoo Foundation |
48 |
# Distributed under the terms of the GNU General Public License v2 |
49 |
|
50 |
diff --git a/bin/binhost-snapshot b/bin/binhost-snapshot |
51 |
index d677e7568..3726bb20a 100755 |
52 |
--- a/bin/binhost-snapshot |
53 |
+++ b/bin/binhost-snapshot |
54 |
@@ -1,4 +1,4 @@ |
55 |
-#!/usr/bin/python -b |
56 |
+#!/usr/bin/env -S python -b |
57 |
# Copyright 2010-2014 Gentoo Foundation |
58 |
# Distributed under the terms of the GNU General Public License v2 |
59 |
|
60 |
diff --git a/bin/check-implicit-pointer-usage.py b/bin/check-implicit-pointer-usage.py |
61 |
index a49db8107..5b3cec019 100755 |
62 |
--- a/bin/check-implicit-pointer-usage.py |
63 |
+++ b/bin/check-implicit-pointer-usage.py |
64 |
@@ -1,4 +1,4 @@ |
65 |
-#!/usr/bin/python -b |
66 |
+#!/usr/bin/env -S python -b |
67 |
|
68 |
# Ripped from HP and updated from Debian |
69 |
# Update by Gentoo to support unicode output |
70 |
diff --git a/bin/chmod-lite.py b/bin/chmod-lite.py |
71 |
index 177be7eab..c34c68912 100755 |
72 |
--- a/bin/chmod-lite.py |
73 |
+++ b/bin/chmod-lite.py |
74 |
@@ -1,4 +1,4 @@ |
75 |
-#!/usr/bin/python -b |
76 |
+#!/usr/bin/env -S python -b |
77 |
# Copyright 2015 Gentoo Foundation |
78 |
# Distributed under the terms of the GNU General Public License v2 |
79 |
|
80 |
diff --git a/bin/chpathtool.py b/bin/chpathtool.py |
81 |
index fbd18b987..fb438e5ba 100755 |
82 |
--- a/bin/chpathtool.py |
83 |
+++ b/bin/chpathtool.py |
84 |
@@ -1,4 +1,4 @@ |
85 |
-#!/usr/bin/python -b |
86 |
+#!/usr/bin/env -S python -b |
87 |
# Copyright 2011-2014 Gentoo Foundation |
88 |
# Distributed under the terms of the GNU General Public License v2 |
89 |
|
90 |
diff --git a/bin/clean_locks b/bin/clean_locks |
91 |
index 94ba4c606..c62d10b94 100755 |
92 |
--- a/bin/clean_locks |
93 |
+++ b/bin/clean_locks |
94 |
@@ -1,4 +1,4 @@ |
95 |
-#!/usr/bin/python -b |
96 |
+#!/usr/bin/env -S python -b |
97 |
# Copyright 1999-2014 Gentoo Foundation |
98 |
# Distributed under the terms of the GNU General Public License v2 |
99 |
|
100 |
diff --git a/bin/dispatch-conf b/bin/dispatch-conf |
101 |
index 62ab3f6cc..9d22aae72 100755 |
102 |
--- a/bin/dispatch-conf |
103 |
+++ b/bin/dispatch-conf |
104 |
@@ -1,4 +1,4 @@ |
105 |
-#!/usr/bin/python -b |
106 |
+#!/usr/bin/env -S python -b |
107 |
# Copyright 1999-2019 Gentoo Authors |
108 |
# Distributed under the terms of the GNU General Public License v2 |
109 |
|
110 |
diff --git a/bin/dohtml.py b/bin/dohtml.py |
111 |
index dfcaa6026..8505134c5 100755 |
112 |
--- a/bin/dohtml.py |
113 |
+++ b/bin/dohtml.py |
114 |
@@ -1,4 +1,4 @@ |
115 |
-#!/usr/bin/python -b |
116 |
+#!/usr/bin/env -S python -b |
117 |
# Copyright 1999-2014 Gentoo Foundation |
118 |
# Distributed under the terms of the GNU General Public License v2 |
119 |
|
120 |
diff --git a/bin/doins.py b/bin/doins.py |
121 |
index 6bc30c90b..8de480e81 100644 |
122 |
--- a/bin/doins.py |
123 |
+++ b/bin/doins.py |
124 |
@@ -1,4 +1,4 @@ |
125 |
-#!/usr/bin/python -b |
126 |
+#!/usr/bin/env -S python -b |
127 |
# Copyright 2017 Gentoo Foundation |
128 |
# Distributed under the terms of the GNU General Public License v2 |
129 |
# |
130 |
diff --git a/bin/ebuild b/bin/ebuild |
131 |
index 460aa0fd1..fbc6ad177 100755 |
132 |
--- a/bin/ebuild |
133 |
+++ b/bin/ebuild |
134 |
@@ -1,4 +1,4 @@ |
135 |
-#!/usr/bin/python -b |
136 |
+#!/usr/bin/env -S python -b |
137 |
# Copyright 1999-2019 Gentoo Authors |
138 |
# Distributed under the terms of the GNU General Public License v2 |
139 |
|
140 |
diff --git a/bin/ebuild-ipc.py b/bin/ebuild-ipc.py |
141 |
index d68d3f05e..02b59f5ef 100755 |
142 |
--- a/bin/ebuild-ipc.py |
143 |
+++ b/bin/ebuild-ipc.py |
144 |
@@ -1,4 +1,4 @@ |
145 |
-#!/usr/bin/python -b |
146 |
+#!/usr/bin/env -S python -b |
147 |
# Copyright 2010-2018 Gentoo Foundation |
148 |
# Distributed under the terms of the GNU General Public License v2 |
149 |
# |
150 |
diff --git a/bin/egencache b/bin/egencache |
151 |
index d172319f8..6fb2fe0fe 100755 |
152 |
--- a/bin/egencache |
153 |
+++ b/bin/egencache |
154 |
@@ -1,4 +1,4 @@ |
155 |
-#!/usr/bin/python -b |
156 |
+#!/usr/bin/env -S python -b |
157 |
# Copyright 2009-2015 Gentoo Foundation |
158 |
# Distributed under the terms of the GNU General Public License v2 |
159 |
|
160 |
diff --git a/bin/emaint b/bin/emaint |
161 |
index df904f7c0..d07e0d022 100755 |
162 |
--- a/bin/emaint |
163 |
+++ b/bin/emaint |
164 |
@@ -1,4 +1,4 @@ |
165 |
-#!/usr/bin/python -b |
166 |
+#!/usr/bin/env -S python -b |
167 |
# Copyright 2005-2014 Gentoo Foundation |
168 |
# Distributed under the terms of the GNU General Public License v2 |
169 |
|
170 |
diff --git a/bin/emerge b/bin/emerge |
171 |
index e372f5e9e..08f92b40e 100755 |
172 |
--- a/bin/emerge |
173 |
+++ b/bin/emerge |
174 |
@@ -1,4 +1,4 @@ |
175 |
-#!/usr/bin/python -b |
176 |
+#!/usr/bin/env -S python -b |
177 |
# Copyright 2006-2014 Gentoo Foundation |
178 |
# Distributed under the terms of the GNU General Public License v2 |
179 |
|
180 |
diff --git a/bin/emirrordist b/bin/emirrordist |
181 |
index 3ea08379e..4797053d6 100755 |
182 |
--- a/bin/emirrordist |
183 |
+++ b/bin/emirrordist |
184 |
@@ -1,4 +1,4 @@ |
185 |
-#!/usr/bin/python -b |
186 |
+#!/usr/bin/env -S python -b |
187 |
# Copyright 2013-2014 Gentoo Foundation |
188 |
# Distributed under the terms of the GNU General Public License v2 |
189 |
|
190 |
diff --git a/bin/env-update b/bin/env-update |
191 |
index 2256b37f5..5de3b1560 100755 |
192 |
--- a/bin/env-update |
193 |
+++ b/bin/env-update |
194 |
@@ -1,4 +1,4 @@ |
195 |
-#!/usr/bin/python -b |
196 |
+#!/usr/bin/env -S python -b |
197 |
# Copyright 1999-2014 Gentoo Foundation |
198 |
# Distributed under the terms of the GNU General Public License v2 |
199 |
|
200 |
diff --git a/bin/filter-bash-environment.py b/bin/filter-bash-environment.py |
201 |
index 045ea6f52..312c322d4 100755 |
202 |
--- a/bin/filter-bash-environment.py |
203 |
+++ b/bin/filter-bash-environment.py |
204 |
@@ -1,4 +1,4 @@ |
205 |
-#!/usr/bin/python -b |
206 |
+#!/usr/bin/env -S python -b |
207 |
# Copyright 1999-2014 Gentoo Foundation |
208 |
# Distributed under the terms of the GNU General Public License v2 |
209 |
|
210 |
diff --git a/bin/fixpackages b/bin/fixpackages |
211 |
index a291e013d..0a977a01b 100755 |
212 |
--- a/bin/fixpackages |
213 |
+++ b/bin/fixpackages |
214 |
@@ -1,4 +1,4 @@ |
215 |
-#!/usr/bin/python -b |
216 |
+#!/usr/bin/env -S python -b |
217 |
# Copyright 1999-2014 Gentoo Foundation |
218 |
# Distributed under the terms of the GNU General Public License v2 |
219 |
|
220 |
diff --git a/bin/glsa-check b/bin/glsa-check |
221 |
index eff01cf31..161553711 100755 |
222 |
--- a/bin/glsa-check |
223 |
+++ b/bin/glsa-check |
224 |
@@ -1,4 +1,4 @@ |
225 |
-#!/usr/bin/python -b |
226 |
+#!/usr/bin/env -S python -b |
227 |
# Copyright 1999-2019 Gentoo Authors |
228 |
# Distributed under the terms of the GNU General Public License v2 |
229 |
|
230 |
diff --git a/bin/install.py b/bin/install.py |
231 |
index 495534d33..d2e757bed 100755 |
232 |
--- a/bin/install.py |
233 |
+++ b/bin/install.py |
234 |
@@ -1,4 +1,4 @@ |
235 |
-#!/usr/bin/python -b |
236 |
+#!/usr/bin/env -S python -b |
237 |
# Copyright 2013-2014 Gentoo Foundation |
238 |
# Distributed under the terms of the GNU General Public License v2 |
239 |
|
240 |
diff --git a/bin/lock-helper.py b/bin/lock-helper.py |
241 |
index aa2dd60fa..8434977e1 100755 |
242 |
--- a/bin/lock-helper.py |
243 |
+++ b/bin/lock-helper.py |
244 |
@@ -1,4 +1,4 @@ |
245 |
-#!/usr/bin/python -b |
246 |
+#!/usr/bin/env -S python -b |
247 |
# Copyright 2010-2014 Gentoo Foundation |
248 |
# Distributed under the terms of the GNU General Public License v2 |
249 |
|
250 |
diff --git a/bin/portageq b/bin/portageq |
251 |
index 3be5ab584..362087afa 100755 |
252 |
--- a/bin/portageq |
253 |
+++ b/bin/portageq |
254 |
@@ -1,4 +1,4 @@ |
255 |
-#!/usr/bin/python -b |
256 |
+#!/usr/bin/env -S python -b |
257 |
# Copyright 1999-2018 Gentoo Foundation |
258 |
# Distributed under the terms of the GNU General Public License v2 |
259 |
|
260 |
diff --git a/bin/quickpkg b/bin/quickpkg |
261 |
index df8c1a8e8..6cf9f6434 100755 |
262 |
--- a/bin/quickpkg |
263 |
+++ b/bin/quickpkg |
264 |
@@ -1,4 +1,4 @@ |
265 |
-#!/usr/bin/python -b |
266 |
+#!/usr/bin/env -S python -b |
267 |
# Copyright 1999-2014 Gentoo Foundation |
268 |
# Distributed under the terms of the GNU General Public License v2 |
269 |
|
270 |
diff --git a/bin/regenworld b/bin/regenworld |
271 |
index bedc58bda..065215379 100755 |
272 |
--- a/bin/regenworld |
273 |
+++ b/bin/regenworld |
274 |
@@ -1,4 +1,4 @@ |
275 |
-#!/usr/bin/python -b |
276 |
+#!/usr/bin/env -S python -b |
277 |
# Copyright 1999-2014 Gentoo Foundation |
278 |
# Distributed under the terms of the GNU General Public License v2 |
279 |
|
280 |
diff --git a/bin/xattr-helper.py b/bin/xattr-helper.py |
281 |
index 49c981580..7e11c1a73 100755 |
282 |
--- a/bin/xattr-helper.py |
283 |
+++ b/bin/xattr-helper.py |
284 |
@@ -1,4 +1,4 @@ |
285 |
-#!/usr/bin/python -b |
286 |
+#!/usr/bin/env -S python -b |
287 |
# Copyright 2012-2018 Gentoo Foundation |
288 |
# Distributed under the terms of the GNU General Public License v2 |
289 |
|
290 |
diff --git a/bin/xpak-helper.py b/bin/xpak-helper.py |
291 |
index 8c965ecda..413febf73 100755 |
292 |
--- a/bin/xpak-helper.py |
293 |
+++ b/bin/xpak-helper.py |
294 |
@@ -1,4 +1,4 @@ |
295 |
-#!/usr/bin/python -b |
296 |
+#!/usr/bin/env -S python -b |
297 |
# Copyright 2009-2014 Gentoo Foundation |
298 |
# Distributed under the terms of the GNU General Public License v2 |
299 |
|
300 |
diff --git a/lib/portage/tests/runTests.py b/lib/portage/tests/runTests.py |
301 |
index d4d1f7c76..9dc06df31 100755 |
302 |
--- a/lib/portage/tests/runTests.py |
303 |
+++ b/lib/portage/tests/runTests.py |
304 |
@@ -1,4 +1,4 @@ |
305 |
-#!/usr/bin/python -bWd |
306 |
+#!/usr/bin/env -S python -bWd |
307 |
# runTests.py -- Portage Unit Test Functionality |
308 |
# Copyright 2006-2014 Gentoo Foundation |
309 |
# Distributed under the terms of the GNU General Public License v2 |
310 |
diff --git a/lib/portage/util/changelog.py b/lib/portage/util/changelog.py |
311 |
index 9fc5ab6df..d99f6c17d 100644 |
312 |
--- a/lib/portage/util/changelog.py |
313 |
+++ b/lib/portage/util/changelog.py |
314 |
@@ -1,4 +1,4 @@ |
315 |
-#!/usr/bin/python -b |
316 |
+#!/usr/bin/env -S python -b |
317 |
# Copyright 2009-2015 Gentoo Foundation |
318 |
# Distributed under the terms of the GNU General Public License v2 |
319 |
|
320 |
diff --git a/runtests b/runtests |
321 |
index 11c317dff..fab9b5157 100755 |
322 |
--- a/runtests |
323 |
+++ b/runtests |
324 |
@@ -1,4 +1,4 @@ |
325 |
-#!/usr/bin/python |
326 |
+#!/usr/bin/env -S python |
327 |
# Copyright 2010-2015 Gentoo Foundation |
328 |
# Distributed under the terms of the GNU General Public License v2 |
329 |
# |
330 |
diff --git a/tabcheck.py b/tabcheck.py |
331 |
index a28ad93d9..8b6ed8738 100755 |
332 |
--- a/tabcheck.py |
333 |
+++ b/tabcheck.py |
334 |
@@ -1,4 +1,4 @@ |
335 |
-#!/usr/bin/python -b |
336 |
+#!/usr/bin/env -S python -b |
337 |
|
338 |
import tabnanny,sys |
339 |
|
340 |
-- |
341 |
2.26.2 |