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

stdenv/setup.sh: fix breakage when shebang contains '\'

Browse Source 
Some programs, e.g. guile-config, has a shebang that ends in '\':

  #!/usr/bin/guile-1.8 \
  -e main -s
  !#
  ;;;; guile-config --- utility for linking programs with Guile
  ;;;; Jim Blandy <jim@red-bean.com> --- September 1997

This currently breaks patchShebangs:

  $ read oldPath arg0 args <<< 'shebang \'; echo $?
  1
  $ echo $oldPath
  shebang
  $ echo $arg0

  $ echo $args

(And setup.sh/patchShebangs is run with 'set -e' so any command that
return non-zero aborts the build.)

Fix by telling 'read' to not interpret backslashes (with the -r flag):

  $ read -r oldPath arg0 args <<< 'shebang \'; echo $?
  0
  $ echo $oldPath
  shebang
  $ echo $arg0
  \
  $ echo $args

Also needed: escape the escape characters so that sed doesn't interpret
them.
This commit is contained in:
Bjørn Forsman 2014-01-03 13:55:41 +01:00
parent 86802e68ff
commit f4f0d2ecb9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/stdenv/generic/setup.sh
View File

@ -677,7 +677,7 @@ patchShebangs() {
fi fi
oldInterpreterLine=$(head -1 "$f" | tail -c +3) oldInterpreterLine=$(head -1 "$f" | tail -c +3)
read oldPath arg0 args <<< "$oldInterpreterLine" read -r oldPath arg0 args <<< "$oldInterpreterLine"
if $(echo "$oldPath" | grep -q "/bin/env$"); then if $(echo "$oldPath" | grep -q "/bin/env$"); then
# Check for unsupported 'env' functionality: # Check for unsupported 'env' functionality:
@ -703,7 +703,9 @@ patchShebangs() {
if [ -n "$oldPath" -a "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE" ]; then if [ -n "$oldPath" -a "${oldPath:0:${#NIX_STORE}}" != "$NIX_STORE" ]; then
if [ -n "$newPath" -a "$newPath" != "$oldPath" ]; then if [ -n "$newPath" -a "$newPath" != "$oldPath" ]; then
echo "$f: interpreter directive changed from \"$oldInterpreterLine\" to \"$newInterpreterLine\"" echo "$f: interpreter directive changed from \"$oldInterpreterLine\" to \"$newInterpreterLine\""
sed -i -e "1 s|.*|#\!$newInterpreterLine|" "$f" # escape the escape chars so that sed doesn't interpret them
escapedInterpreterLine=$(echo "$newInterpreterLine" | sed 's|\\|\\\\|g')
sed -i -e "1 s|.*|#\!$escapedInterpreterLine|" "$f"
fi fi
fi fi
done done