summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Ward <gward@python.net>2001-07-25 20:20:11 (GMT)
committerGreg Ward <gward@python.net>2001-07-25 20:20:11 (GMT)
commit7cf7e7e52983b23951ede34f44a903a38dcbdcb4 (patch)
tree5d8e52377f6a8b2d8d78a67fe7b2b03355a98be4
parente628a2fa85ed2f94c6049f3ccb8d671052389548 (diff)
downloadcpython-7cf7e7e52983b23951ede34f44a903a38dcbdcb4.zip
cpython-7cf7e7e52983b23951ede34f44a903a38dcbdcb4.tar.gz
cpython-7cf7e7e52983b23951ede34f44a903a38dcbdcb4.tar.bz2
Undo revision 1.7: always mangle a #! line containing "python" to point
to the current Python interpreter (ie. the one used for building/installation), even (especially!) if "/usr/bin/env" appears in the #! line. Rationale: installing scripts with "#!/usr/bin/env python" is asking for trouble, because 1) it might pick the wrong interpreter (not the one used to build/install the script) 2) it doesn't work on all platforms (try it on IRIX 5, or on Linux with command-line options for python) 3) "env" might not be in /usr/bin
-rw-r--r--Lib/distutils/command/build_scripts.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/Lib/distutils/command/build_scripts.py b/Lib/distutils/command/build_scripts.py
index ee7f4e2..653b8d8 100644
--- a/Lib/distutils/command/build_scripts.py
+++ b/Lib/distutils/command/build_scripts.py
@@ -10,10 +10,8 @@ import sys, os, re
from distutils.core import Command
from distutils.dep_util import newer
-# check if Python is called on the first line with this expression.
-# This expression will leave lines using /usr/bin/env alone; presumably
-# the script author knew what they were doing...)
-first_line_re = re.compile(r'^#!(?!\s*/usr/bin/env\b).*python(\s+.*)?')
+# check if Python is called on the first line with this expression
+first_line_re = re.compile(r'^#!.*python(\s+.*)?')
class build_scripts (Command):