X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=bin%2Fexx;h=8321cf303a1aa28e7e1112dff8bf826ad6f5c064;hp=b71de1be401ddcf6ae17bc18d562254d7e1323d5;hb=1fc8f7d6c266e5bfd376cee3769e63b1d64f4ca4;hpb=87fb5ee57662a571ff00c5c7ca0951c871e142a6

diff --git a/bin/exx b/bin/exx
index b71de1b..8321cf3 100755
--- a/bin/exx
+++ b/bin/exx
@@ -8,20 +8,23 @@ use warnings;
 use IO::Handle;
 use Cwd qw(chdir cwd);
 
-use constant FORMAT_TAR_GZ=>'tar xzf $pathname;i=`echo *`;echo "$i"|grep -q " " || test * != $base ||'
-                            .'(mv "$i" "$i".$$;(set +x;mv "$i".$$/* .);rmdir "$i".$$)';
+use constant FORMAT_TAR=>'tar xf $pathname;i=`echo *`;echo "$i"|grep -q " " || test * != $base ||'
+                         .'(mv "$i" "$i".$$;(set +x;mv "$i".$$/* .);rmdir "$i".$$)';
 use constant FORMATS=>{
 	"rpm"    =>'rpm2cpio $pathname|cpio -id --quiet',	#-v #FIXME: --sparse doesn't work, why?
 	"zip"    =>'unzip -Lq $pathname',
+	"jar"    =>'unzip -Lq $pathname',
 	"a"      =>'ar x $pathname',
 	"deb"    =>'ar x $pathname;'
 	           .'for i in *.tar.gz;do j=`basename $i .tar.gz`;mkdir -p $j;cd $j;tar xzf ../$i;cd ..;rm -f $i;done',
 	"arj"    =>'unarj x $pathname',
-	"tar.gz" =>FORMAT_TAR_GZ,
+	"tar"    =>FORMAT_TAR,
+	"tar.gz" =>do { $_=FORMAT_TAR; s/xf/xzf/; $_; },
 	"tgz"    =>"tar.gz",
-	"tar.bz2"=>do { $_=FORMAT_TAR_GZ; s/xzf/xjf/; $_; },
+	"tar.bz2"=>do { $_=FORMAT_TAR; s/xf/xjf/; $_; },
 	"tar.bz" =>"tar.bz2",
 	"tbz"    =>"tar.bz",
+	"msi"    =>'cabextract -q $pathname',
 	};
 
 die "Syntax: $0 <pathname((".join("|",map(".$_",sort keys %{+FORMATS})).")|=<ext>)>..."
@@ -37,7 +40,7 @@ for my $fname (@ARGV) {
 	$parsed[3] or die "Extension not found for archive: $fname";
 	my($path,$base,$ext)=@parsed[0,1,3];
 	my($pathname)=($parsed[2] eq "=" ? "$path$base" : $fname);
-	my($cmdtry,$cmd)=($ext);
+	my($cmdtry,$cmd)=(lc $ext);
 	do {
 		$cmd=$cmdtry;
 		$cmdtry=FORMATS->{$cmdtry};