* Don't clobber $shell.

svn path=/nixpkgs/trunk/; revision=7512
2006-12-28 11:32:20 +00:00 · 2006-12-28 11:32:20 +00:00 · 98e5779a9b
parent bb9f4a2280
commit 98e5779a9b
1 changed files with 3 additions and 1 deletions
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@ -16,7 +16,9 @@ fi

 # Execute the pre-hook.
 export SHELL=@shell@
-export shell=@shell@
+if test -z "$shell"; then
+    export shell=@shell@
+fi
 param1=@param1@
 param2=@param2@
 param3=@param3@