* Use gzip -d / bzip2 -d instead of gunzip / bunzip2.
svn path=/nixpkgs/branches/stdenv-updates/; revision=9839
This commit is contained in:
parent
31034cb3d1
commit
ff95bc3eea
@ -437,10 +437,10 @@ unpackFile() {
|
|||||||
tar xvf $file || fail
|
tar xvf $file || fail
|
||||||
;;
|
;;
|
||||||
*.tar.gz | *.tgz | *.tar.Z)
|
*.tar.gz | *.tgz | *.tar.Z)
|
||||||
gunzip < $file | tar xvf - || fail
|
gzip -d < $file | tar xvf - || fail
|
||||||
;;
|
;;
|
||||||
*.tar.bz2 | *.tbz2)
|
*.tar.bz2 | *.tbz2)
|
||||||
bunzip2 < $file | tar xvf - || fail
|
bzip2 -d < $file | tar xvf - || fail
|
||||||
;;
|
;;
|
||||||
*.zip)
|
*.zip)
|
||||||
unzip $file || fail
|
unzip $file || fail
|
||||||
@ -562,10 +562,10 @@ patchW() {
|
|||||||
local uncompress=cat
|
local uncompress=cat
|
||||||
case $i in
|
case $i in
|
||||||
*.gz)
|
*.gz)
|
||||||
uncompress=gunzip
|
uncompress="gzip -d"
|
||||||
;;
|
;;
|
||||||
*.bz2)
|
*.bz2)
|
||||||
uncompress=bunzip2
|
uncompress="bzip2 -d"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
$uncompress < $i | patch $patchFlags || fail
|
$uncompress < $i | patch $patchFlags || fail
|
||||||
|
Loading…
x
Reference in New Issue
Block a user