summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-03-03 18:38:57 +0000
committerDan McGee <dan@archlinux.org>2007-03-03 18:38:57 +0000
commit02d46e33d1d8b69c67fccc90f8ad580481660a03 (patch)
tree34f9c13d7db99084d37b5f08ed55fc2289540e47
parenta0abb9399249c922bee8ea99c652f385d8bcdb7a (diff)
downloadpacman-02d46e33d1d8b69c67fccc90f8ad580481660a03.tar.xz
* file utility was updated to version 4.20, removing code that was there to
catch a bug in 4.19.
-rwxr-xr-xscripts/makepkg18
1 files changed, 6 insertions, 12 deletions
diff --git a/scripts/makepkg b/scripts/makepkg
index 3f6fe1d1..68713f46 100755
--- a/scripts/makepkg
+++ b/scripts/makepkg
@@ -769,23 +769,17 @@ else
file_type=$(file -biz "$file")
unset cmd
case "$file_type" in
- # START REMOVE
- # TODO remove this with release of file v4.20, temp bugfix
- *application/empty*)
- cmd="tar -xf $file"
- warning "file had trouble detecting type, assuming tar" ;;
- # END REMOVE
*application/x-tar*)
- cmd="tar -xf $file" ;;
+ cmd="tar -xf $file" ;;
*application/x-zip*)
- unziphack=1
- cmd="unzip -qqo $file" ;;
+ unziphack=1
+ cmd="unzip -qqo $file" ;;
*application/x-cpio*)
- cmd="bsdtar -x -f $file" ;;
+ cmd="bsdtar -x -f $file" ;;
*application/x-gzip*)
- cmd="gunzip -f $file" ;;
+ cmd="gunzip -f $file" ;;
*application/x-bzip*)
- cmd="bunzip2 -f $file" ;;
+ cmd="bunzip2 -f $file" ;;
esac
if [ "$cmd" != "" ]; then
msg2 "$cmd"