Stop assuming that /usr/bin/python exists

Fixes 33192

diff --git a/changes/ticket33192 b/changes/ticket33192
new file mode 100644 (file)
index 0000000..97f9762
--- /dev/null
+++ b/changes/ticket33192
@@ -0,0 +1,5 @@
+  o Minor feature (python):
+    - Stop assuming that /usr/bin/python exists. Instead of using a
+      hardcoded path in scripts that still use Python 2, use /usr/bin/env,
+      similarly to the scripts that use Python 3. Fixes bug 33192; bugfix
+      on 0.4.2.
\ No newline at end of file

diff --git a/contrib/client-tools/tor-resolve.py b/contrib/client-tools/tor-resolve.py
index 3562193715d48ea70349e9a43dcf8dbf57ad2138..85e7d2d8b4dbf1d855df8eb4ed3885d8fe3ddb2e 100755 (executable)
--- a/contrib/client-tools/tor-resolve.py
+++ b/contrib/client-tools/tor-resolve.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Future imports for Python 2.7, mandatory in 3.0
 from __future__ import division

diff --git a/scripts/codegen/fuzzing_include_am.py b/scripts/codegen/fuzzing_include_am.py
index aa3ba49a73f57f48f6ceed6139254662eb2c5bbc..ae5056307471fb117f52863bef0764ea3278471c 100755 (executable)
--- a/scripts/codegen/fuzzing_include_am.py
+++ b/scripts/codegen/fuzzing_include_am.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Future imports for Python 2.7, mandatory in 3.0
 from __future__ import division

diff --git a/scripts/codegen/gen_server_ciphers.py b/scripts/codegen/gen_server_ciphers.py
index 3b779522431dc61f559f3543928fee361063a7aa..8c88e54a13fced234d94eef16060646f1bc19f26 100755 (executable)
--- a/scripts/codegen/gen_server_ciphers.py
+++ b/scripts/codegen/gen_server_ciphers.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright 2014-2019, The Tor Project, Inc
 # See LICENSE for licensing information
 

diff --git a/scripts/codegen/get_mozilla_ciphers.py b/scripts/codegen/get_mozilla_ciphers.py
index 165105736a25720fbd784bebced3e26bc120d3d9..ff01dd8719f5a50983c19c526fba813711f709b0 100755 (executable)
--- a/scripts/codegen/get_mozilla_ciphers.py
+++ b/scripts/codegen/get_mozilla_ciphers.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # coding=utf-8
 # Copyright 2011-2019, The Tor Project, Inc
 # original version by Arturo Filastò

diff --git a/scripts/codegen/makedesc.py b/scripts/codegen/makedesc.py
index af926a64389ee2113fff550c8dc98226a9243796..48d1d31a020cc8898fc0184cc2d547e64ed03c23 100644 (file)
--- a/scripts/codegen/makedesc.py
+++ b/scripts/codegen/makedesc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright 2014-2019, The Tor Project, Inc.
 # See LICENSE for license information
 

diff --git a/scripts/maint/annotate_ifdef_directives.py b/scripts/maint/annotate_ifdef_directives.py
index cd70b55c8c1725b7437778e15f965a8673d2fc65..9ca090d59592416ef43e76ea9944a32f3fb64219 100755 (executable)
--- a/scripts/maint/annotate_ifdef_directives.py
+++ b/scripts/maint/annotate_ifdef_directives.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2017-2019, The Tor Project, Inc.
 # See LICENSE for licensing information
 

diff --git a/scripts/maint/checkIncludes.py b/scripts/maint/checkIncludes.py
index 2ca46347f08d8dafd571dd302930090c9af25aef..ae0ccb9e12bfcad53001d2cf314d72f0e44d25c1 100755 (executable)
--- a/scripts/maint/checkIncludes.py
+++ b/scripts/maint/checkIncludes.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright 2018 The Tor Project, Inc.  See LICENSE file for licensing info.
 
 # This file is no longer here; see practracker/includes.py for this

diff --git a/scripts/maint/format_changelog.py b/scripts/maint/format_changelog.py
index 32085c36022427843d815289331ca4f15ff1e32a..7cf55a0d964b1ca9319d1dbe0d32b199fbd6c5ab 100755 (executable)
--- a/scripts/maint/format_changelog.py
+++ b/scripts/maint/format_changelog.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2014-2019, The Tor Project, Inc.
 # See LICENSE for licensing information
 #

diff --git a/scripts/maint/lintChanges.py b/scripts/maint/lintChanges.py
index 88a865a572c5848b306046e5007dd88c6fb92569..eced70ae73ead0dfabe3f3423f8faf4be7c39136 100755 (executable)
--- a/scripts/maint/lintChanges.py
+++ b/scripts/maint/lintChanges.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Future imports for Python 2.7, mandatory in 3.0
 from __future__ import division

diff --git a/scripts/maint/locatemissingdoxygen.py b/scripts/maint/locatemissingdoxygen.py
index 7733977359c895901883dab84a2915af82d22f9b..a2844346d64994d71dafe3eadc144bef9a4734d9 100755 (executable)
--- a/scripts/maint/locatemissingdoxygen.py
+++ b/scripts/maint/locatemissingdoxygen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """
   This script parses the stderr output of doxygen and looks for undocumented

diff --git a/scripts/maint/practracker/includes.py b/scripts/maint/practracker/includes.py
index fe0f32e25389000508800f81595dc02423132a8d..e9b02c35b04a1aa970e1c38c9235d47e850c6561 100755 (executable)
--- a/scripts/maint/practracker/includes.py
+++ b/scripts/maint/practracker/includes.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright 2018 The Tor Project, Inc.  See LICENSE file for licensing info.
 
 """This script looks through all the directories for files matching *.c or

diff --git a/scripts/maint/practracker/metrics.py b/scripts/maint/practracker/metrics.py
index ae88b84f313b4d3036ae88e75109b99ad0a6a685..300a4501a95d770bec74df18cb4009c6ebdea95f 100644 (file)
--- a/scripts/maint/practracker/metrics.py
+++ b/scripts/maint/practracker/metrics.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Implementation of various source code metrics.
 # These are currently ad-hoc string operations and regexps.

diff --git a/scripts/maint/practracker/practracker.py b/scripts/maint/practracker/practracker.py
index 6149fb79cb74ef61948f448088daf2ede004884d..b6a1f781374da542b1146b871a80118cef159684 100755 (executable)
--- a/scripts/maint/practracker/practracker.py
+++ b/scripts/maint/practracker/practracker.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """
 Best-practices tracker for Tor source code.

diff --git a/scripts/maint/practracker/practracker_tests.py b/scripts/maint/practracker/practracker_tests.py
index 8d0418880c41d5829a97c98ea8c16cdace9f7fc0..e03c9e05aeca22d9d782889e362d8f3fcf609daf 100755 (executable)
--- a/scripts/maint/practracker/practracker_tests.py
+++ b/scripts/maint/practracker/practracker_tests.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 """Some simple tests for practracker metrics"""
 

diff --git a/scripts/maint/rectify_include_paths.py b/scripts/maint/rectify_include_paths.py
index 111cf816ce3a4c9a025f9716af528c1a5b9102d2..c6c5026711fa1c2bac0d3b3dde631c2e14fde222 100755 (executable)
--- a/scripts/maint/rectify_include_paths.py
+++ b/scripts/maint/rectify_include_paths.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Future imports for Python 2.7, mandatory in 3.0
 from __future__ import division

diff --git a/scripts/maint/redox.py b/scripts/maint/redox.py
index 3ad3e3f1b8b2351918e8b58c01c1bd75dbffefb8..12b02c8a447f8f28de587b7fb6d5d8b2fb9ab550 100755 (executable)
--- a/scripts/maint/redox.py
+++ b/scripts/maint/redox.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 #  Copyright (c) 2008-2019, The Tor Project, Inc.
 #  See LICENSE for licensing information.

diff --git a/scripts/maint/sortChanges.py b/scripts/maint/sortChanges.py
index 2e049b1e535e49b0d901812f076b18f0a2a2fa33..5f6324e3878b185a09e6ef9cfbe160a26dd9ba17 100755 (executable)
--- a/scripts/maint/sortChanges.py
+++ b/scripts/maint/sortChanges.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Copyright (c) 2014-2019, The Tor Project, Inc.
 # See LICENSE for licensing information