Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=f68b52a4a8314240b9b8d5f0c8dd6a44b5a74f94
commit f68b52a4a8314240b9b8d5f0c8dd6a44b5a74f94
Author: Michel Hermier <herm...@frugalware.org>
Date: Thu Jul 22 11:30:39 2010 +0200
makepkg: sync Fextract with util.sh.
diff --git a/scripts/makepkg b/scripts/makepkg
index c177dd4..e1439d0 100755
--- a/scripts/makepkg
+++ b/scripts/makepkg
@@ -70,14 +70,16 @@ Fextract() {
file="${1}"
tmp="$($ECHO "${file}" | tr 'A-Z' 'a-z')"
case "${tmp}" in
- *.tar.gz|*.tar.z|*.tgz)
- cmd="tar --use-compress-program=gzip -xf $file" ;;
*.tar.bz2|*.tbz2)
- cmd="tar --use-compress-program=bzip2 -xf $file" ;;
+ cmd="tar $_F_extract_taropts --use-compress-program=bzip2 -xf
$file" ;;
+ *.tar.gz|*.tar.z|*.tgz)
+ cmd="tar $_F_extract_taropts --use-compress-program=gzip -xf
$file" ;;
*.tar.lzma)
- cmd="tar --use-compress-program=lzma -xf $file" ;;
+ cmd="tar $_F_extract_taropts --use-compress-program=lzma -xf
$file" ;;
+ *.tar.xz)
+ cmd="tar $_F_extract_taropts --use-compress-program=xz -xf
$file" ;;
*.tar)
- cmd="tar -xf $file" ;;
+ cmd="tar $_F_extract_taropts -xf $file" ;;
*.zip|*.xpi)
unziphack=1
cmd="unzip -qqo $file" ;;
@@ -89,6 +91,10 @@ Fextract() {
cmd="gunzip -f $file" ;;
*.bz2)
cmd="bunzip2 -f $file" ;;
+ *.lzma)
+ cmd="unlzma -f $file" ;;
+ *.xz)
+ cmd="unxz -f $file" ;;
*.7z)
cmd="7z x $file" ;;
*)
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
