From 76f4eb5f93451b6300e42f775c4a63adbb7f4986 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Sep 2014 20:45:41 +0400
Subject: [PATCH] Revert "python-wrapper: fix wrapped argv[0] w/o sed, maybe"

This reverts commit a6dd9bd0cb3ef4896c41f70e37bc3a72d36aa569.
---
 pkgs/build-support/setup-hooks/make-wrapper.sh  | 5 +----
 pkgs/development/python-modules/generic/wrap.sh | 6 ++++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh
index 95d1a519213..41f2a59246d 100644
--- a/pkgs/build-support/setup-hooks/make-wrapper.sh
+++ b/pkgs/build-support/setup-hooks/make-wrapper.sh
@@ -96,10 +96,7 @@ filterExisting() {
 # Syntax: wrapProgram <PROGRAM> <MAKE-WRAPPER FLAGS...>
 wrapProgram() {
     local prog="$1"
-    local progBasename=$(basename $prog)
-    local hiddenDir=$(dirname $prog)/.$progBasename-wrapped-bin
-    local hidden=$hiddenDir/$progBasename
-    mkdir $hiddenDir
+    local hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped
     mv $prog $hidden
     makeWrapper $hidden $prog "$@"
 }
diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh
index 282aeca9ed1..857f002cace 100644
--- a/pkgs/development/python-modules/generic/wrap.sh
+++ b/pkgs/development/python-modules/generic/wrap.sh
@@ -26,6 +26,12 @@ wrapPythonProgramsIn() {
             # dont wrap EGG-INFO scripts since they are called from python
             if echo "$i" | grep -v EGG-INFO/scripts; then
                 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" \
                     --prefix PYTHONPATH ":" $program_PYTHONPATH \
                     --prefix PATH ":" $program_PATH