.mc/menu: another fix for unrar

[dotfiles.git] / .mc / menu

diff --git a/.mc/menu b/.mc/menu
index 901c90b6a4a322566aba7a16d440854eb67d4996..9c01575915fd533ff42670ac2b6227930c9721ea 100644 (file)
--- a/.mc/menu
+++ b/.mc/menu
@@ -57,6 +57,10 @@ T  fb2txt
    esac
    $A %f | xsltproc /usr/local/src/FictionBook/FB2_2_txt_ru.xsl - | webstdin -e txt -t
 
++= t r & f \.(pdf|PDF|ps|PS|djvu)(\.bz2|\.gz)?$
+e  View pdf/ps/djvu
+   qpdfview %f &
+
 += t r & f \.(odt|ott|sxw|stw|ods|ots|sxc|stc|odp|otp|sxi|sti|odg|otg|sxd|std|odb|odf|sxm|odm|sxg)$
 o  View OpenDoc with odt2txt
    odt2txt %f | ${PAGER:-more}
@@ -65,10 +69,6 @@ o  View OpenDoc with odt2txt
 e  Edit OpenDoc with libreoffice
    libreoffice %f &
 
-+= t r & f \.(pdf|PDF|ps|PS|djvu)(\.bz2|\.gz)?$
-e  View pdf/ps/djvu with evince
-   evince %f &
-
 += t r & f \.(doc|DOC|rtf)$
 d  View doc with catdoc
    catdoc %f | ${PAGER:-more}
@@ -332,36 +332,6 @@ N  Create a directory for the other archive
    esac
    exec mkdir "$D"
 
-+ f \.(bz2|gz|lz|lzma|7z|xz|tar|zip|ZIP|rar|RAR)$ & t r
-x  Extract a compressed file
-   case %f in
-     *.bz2)  P="bzip2 -d";;
-     *.gz)   P="gzip -d";;
-     *.lz)   P="lzip -d";;
-     *.lzma) P="lzma -d";;
-     *.7z)   P="7zr x";;
-     *.xz)   P="xz -d";;
-     *.tar)  P="tar xvpf";;
-     *.zip|*.ZIP) P="uzip";;
-     *.rar|*.RAR) P="rar x -y";;
-   esac
-   exec $P %f
-
-+ F \.(bz2|gz|lz|lzma|7z|xz|tar|zip|ZIP|rar|RAR)$ & T r
-X  Extract another compressed file
-   case %F in
-     *.bz2)  P="bzip2 -d";;
-     *.gz)   P="gzip -d";;
-     *.lz)   P="lzip -d";;
-     *.lzma) P="lzma -d";;
-     *.7z)   P="7zr x";;
-     *.xz)   P="xz -d";;
-     *.tar)  P="tar xvpf";;
-     *.zip|*.ZIP) P="uzip";;
-     *.rar|*.RAR) P="rar x -y";;
-   esac
-   exec $P %D/%F
-
 + f \.tar\.gz$ | f \.tar\.z$ | f \.tgz$ | f \.tpz$ | f \.tar\.lz$ | f \.tar\.lzma$ | f \.tar\.7z$ | f \.tar\.xz$ | f \.tar\.Z$ | f \.tar\.bz2$ & t r
 x  Extract the contents of a compressed tar file
    unset PRG
@@ -388,7 +358,7 @@ x  Extract the contents of a compressed tar file
       exit 1
       ;;
    esac
-   $PRG %f | tar xvf -
+   $PRG %f | tar xvpf -
 
 + F \.tar\.gz$ | F \.tar\.z$ | F \.tgz$ | F \.tpz$ | F \.tar\.lz$ | F \.tar\.lzma$ | F \.tar\.7z$ | F \.tar\.xz$ | F \.tar\.Z$ | F \.tar\.bz2$ & T r
 X  Extract the contents of an other compressed tar file
@@ -416,7 +386,37 @@ X  Extract the contents of an other compressed tar file
       exit 1
       ;;
    esac
-   $PRG %D/%F | tar xvf -
+   $PRG %D/%F | tar xvpf -
+
++ f \.(bz2|gz|lz|lzma|7z|xz|tar|zip|ZIP|rar|RAR)$ & t r
+x  Extract a compressed file
+   case %f in
+     *.bz2)  P="bzip2 -d";;
+     *.gz)   P="gzip -d";;
+     *.lz)   P="lzip -d";;
+     *.lzma) P="lzma -d";;
+     *.7z)   P="7zr x";;
+     *.xz)   P="xz -d";;
+     *.tar)  P="tar xvpf";;
+     *.zip|*.ZIP) P="unzip";;
+     *.rar|*.RAR) P="unrar x -y";;
+   esac
+   exec $P %f
+
++ F \.(bz2|gz|lz|lzma|7z|xz|tar|zip|ZIP|rar|RAR)$ & T r
+X  Extract another compressed file
+   case %F in
+     *.bz2)  P="bzip2 -d";;
+     *.gz)   P="gzip -d";;
+     *.lz)   P="lzip -d";;
+     *.lzma) P="lzma -d";;
+     *.7z)   P="7zr x";;
+     *.xz)   P="xz -d";;
+     *.tar)  P="tar xvpf";;
+     *.zip|*.ZIP) P="unzip";;
+     *.rar|*.RAR) P="unrar x -y";;
+   esac
+   exec $P %D/%F
 
 + t r & f \.(zip|ZIP)$
 y  Extract from zip with recoded filenames
@@ -456,11 +456,13 @@ V  vimdiff these files
 
 + t d & ! f ^\.\.$
 d  Diff the directory
-   exec diff -ru --speed-large-files %D/%f %f
+   exec diff -ru --speed-large-files \
+      -x CVS -x .git -x .hg -x .svn -x '*.py[co]' %D/%f %f
 
 + t d & T d & ! F ^\.\.$
 D  Diff these directories
-   exec diff -ru --speed-large-files %D/%F %f
+   exec diff -ru --speed-large-files \
+      -x CVS -x .git -x .hg -x .svn -x '*.py[co]' %D/%F %f
 
 += f \.(asc|sig(n)?)$ & t r
 v  Verify signature