rpmsafe: realpath fixes

[nethome.git] / bin / exx

diff --git a/bin/exx b/bin/exx
index b71de1b..97f021b 100755 (executable)
--- a/bin/exx
+++ b/bin/exx
@@ -8,20 +8,25 @@ 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",
+       "tar.xz" =>do { $_=FORMAT_TAR; s/xf/xJf/; $_; },
+       "txz"    =>do { $_=FORMAT_TAR; s/xf/xJf/; $_; },
+       "msi"    =>'cabextract -q $pathname',
        };
 
 die "Syntax: $0 <pathname((".join("|",map(".$_",sort keys %{+FORMATS})).")|=<ext>)>..."
@@ -37,7 +42,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};