Skip to content

Commit

Permalink
build: move meta-shebang back to configure
Browse files Browse the repository at this point in the history
PR-URL: nodejs#22450
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
(cherry picked from commit cc9dd0f)
  • Loading branch information
refack authored and BaochengSu committed Sep 28, 2020
1 parent 17d981e commit 8423f97
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 26 deletions.
28 changes: 28 additions & 0 deletions configure
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#!/bin/sh

# Locate python2 interpreter and re-execute the script. Note that the
# mix of single and double quotes is intentional, as is the fact that
# the ] goes on a new line.
_=[ 'exec' '/bin/sh' '-c' '''
which python2.7 >/dev/null && exec python2.7 "$0" "$@"
which python2 >/dev/null && exec python2 "$0" "$@"
exec python "$0" "$@"
''' "$0" "$@"
]
del _

import sys
from distutils.spawn import find_executable as which
if sys.version_info[0] != 2 or sys.version_info[1] not in (6, 7):
sys.stderr.write('Please use either Python 2.6 or 2.7')

python2 = which('python2') or which('python2.6') or which('python2.7')

if python2:
sys.stderr.write(':\n\n')
sys.stderr.write(' ' + python2 + ' ' + ' '.join(sys.argv))

sys.stderr.write('\n')
sys.exit(1)

import configure
27 changes: 1 addition & 26 deletions configure.py
Original file line number Diff line number Diff line change
@@ -1,30 +1,4 @@
#!/bin/sh

# Locate python2 interpreter and re-execute the script. Note that the
# mix of single and double quotes is intentional, as is the fact that
# the ] goes on a new line.
_=[ 'exec' '/bin/sh' '-c' '''
which python2.7 >/dev/null && exec python2.7 "$0" "$@"
which python2 >/dev/null && exec python2 "$0" "$@"
exec python "$0" "$@"
''' "$0" "$@"
]
del _

import sys
from distutils.spawn import find_executable as which
if sys.version_info[0] != 2 or sys.version_info[1] not in (6, 7):
sys.stderr.write('Please use either Python 2.6 or 2.7')

python2 = which('python2') or which('python2.6') or which('python2.7')

if python2:
sys.stderr.write(':\n\n')
sys.stderr.write(' ' + python2 + ' ' + ' '.join(sys.argv))

sys.stderr.write('\n')
sys.exit(1)

import errno
import optparse
import os
Expand All @@ -34,6 +8,7 @@
import subprocess
import shutil
import string
from distutils.spawn import find_executable as which

# If not run from node/, cd to node/.
os.chdir(os.path.dirname(__file__) or '.')
Expand Down

0 comments on commit 8423f97

Please sign in to comment.