public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "python-wrapper: fix wrapped argv[0] w/o sed, maybe"

Browse Source 
This reverts commit a6dd9bd0cb3ef4896c41f70e37bc3a72d36aa569.
This commit is contained in:
Michael Raskin 2014-09-02 20:45:41 +04:00
parent af4c369d0a
commit 76f4eb5f93
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/build-support/setup-hooks/make-wrapper.sh
View File

@ -96,10 +96,7 @@ filterExisting() {
# Syntax: wrapProgram <PROGRAM> <MAKE-WRAPPER FLAGS...> # Syntax: wrapProgram <PROGRAM> <MAKE-WRAPPER FLAGS...>
wrapProgram() { wrapProgram() {
local prog="$1" local prog="$1"
local progBasename=$(basename $prog) local hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped
local hiddenDir=$(dirname $prog)/.$progBasename-wrapped-bin
local hidden=$hiddenDir/$progBasename
mkdir $hiddenDir
mv $prog $hidden mv $prog $hidden
makeWrapper $hidden $prog "$@" makeWrapper $hidden $prog "$@"
} }

6
pkgs/development/python-modules/generic/wrap.sh
View File

@ -26,6 +26,12 @@ wrapPythonProgramsIn() {
# dont wrap EGG-INFO scripts since they are called from python # dont wrap EGG-INFO scripts since they are called from python
if echo "$i" | grep -v EGG-INFO/scripts; then if echo "$i" | grep -v EGG-INFO/scripts; then
echo "wrapping \`$i'..." echo "wrapping \`$i'..."
sed -i "$i" -re '1 {
/^#!/!b; :r
/\\$/{N;b r}
/__future__|^ *(#.*)?$/{n;b r}
/^ *[^# ]/i import sys; sys.argv[0] = '"'$(basename "$i")'"'
}'
wrapProgram "$i" \ wrapProgram "$i" \
--prefix PYTHONPATH ":" $program_PYTHONPATH \ --prefix PYTHONPATH ":" $program_PYTHONPATH \
--prefix PATH ":" $program_PATH --prefix PATH ":" $program_PATH