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

stdenv: added escaping for patches

Browse Source
This commit is contained in:
Nikolay Amiantov 2014-10-09 23:41:56 +04:00 committed by Bjørn Forsman
parent d15e52f25f
commit d59327b938
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -569,12 +569,12 @@ patchPhase() {
for i in $patches; do for i in $patches; do
header "applying patch $i" 3 header "applying patch $i" 3
if [ ! -r $i ]; then if [ ! -r "$i" ]; then
echo "file $i does not exist or not readable" echo "file $i does not exist or not readable"
exit 1 exit 1
fi fi
local uncompress=cat local uncompress=cat
case $i in case "$i" in
*.gz) *.gz)
uncompress="gzip -d" uncompress="gzip -d"
;; ;;
@ -589,7 +589,7 @@ patchPhase() {
;; ;;
esac esac
# "2>&1" is a hack to make patch fail if the decompressor fails (nonexistent patch, etc.) # "2>&1" is a hack to make patch fail if the decompressor fails (nonexistent patch, etc.)
$uncompress < $i 2>&1 | patch ${patchFlags:--p1} $uncompress < "$i" 2>&1 | patch ${patchFlags:--p1}
stopNest stopNest
done done