.mc/menu: another fix for unrar

[dotfiles.git] / .mc / menu

diff --git a/.mc/menu b/.mc/menu
index b48ec64a04bea459e7a20aaa444f20d98381f4c4..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}
@@ -247,27 +247,36 @@ y  Compress the current subdirectory to zip with recoded filenames
    cd .. && zip.py "$zip".zip "$Pwd" &&
    echo ../"$zip".zip created.
 
-+ ! f \.bz2$ & ! f \.gz$ & ! f \.lz$ & ! f \.lzma$ & ! f \.7z$ & ! f \.xz$ & ! f \.(zip|ZIP)$
++ t d & f ^\.\.$
+7  Compress the current subdirectory to 7z
+   Pwd="`basename %d /`"
+   echo -n "Name of the distribution file (without extension) [$Pwd]: "
+   read ar
+   if [ "$ar"x = x ]; then ar="$Pwd"; fi
+   cd .. && 7zr a "$ar".7z "$Pwd" &&
+   echo ../"$ar".7z created.
+
++ ! f \.bz2$ & ! f \.gz$ & ! f \.lz$ & ! f \.lzma$ & ! f \.7z$ & ! f \.xz$ & ! f \.(zip|ZIP)$ & t r
 z  bzip2 the file
-   exec bzip2 -9 %f.bz2 %f
+   exec bzip2 -9 %f
 
-+ ! f \.bz2$ & ! f \.gz$ & ! f \.lz$ & ! f \.lzma$ & ! f \.7z$ & ! f \.xz$ & ! f \.(zip|ZIP)$
++ ! f \.bz2$ & ! f \.gz$ & ! f \.lz$ & ! f \.lzma$ & ! f \.7z$ & ! f \.xz$ & ! f \.(zip|ZIP)$ & t r
 z  gzip the file
    exec gzip -9 %f
 
-+ ! f \.bz2$ & ! f \.gz$ & ! f \.lz$ & ! f \.lzma$ & ! f \.7z$ & ! f \.xz$ & ! f \.(zip|ZIP)$
++ ! f \.bz2$ & ! f \.gz$ & ! f \.lz$ & ! f \.lzma$ & ! f \.7z$ & ! f \.xz$ & ! f \.(zip|ZIP)$ & t r
 z  lzip the file
    exec lzip -9 %f
 
-+ ! f \.bz2$ & ! f \.gz$ & ! f \.lz$ & ! f \.lzma$ & ! f \.7z$ & ! f \.xz$ & ! f \.(zip|ZIP)$
++ ! f \.bz2$ & ! f \.gz$ & ! f \.lz$ & ! f \.lzma$ & ! f \.7z$ & ! f \.xz$ & ! f \.(zip|ZIP)$ & t r
 z  lzma the file
    exec lzma -9 %f
 
 + ! f \.bz2$ & ! f \.gz$ & ! f \.lz$ & ! f \.lzma$ & ! f \.7z$ & ! f \.xz$ & ! f \.(zip|ZIP)$
 z  7z the file/directory
-   exec 7zr a %f
+   exec 7zr a %f.7z %f
 
-+ ! f \.bz2$ & ! f \.gz$ & ! f \.lz$ & ! f \.lzma$ & ! f \.7z$ & ! f \.xz$ & ! f \.(zip|ZIP)$
++ ! f \.bz2$ & ! f \.gz$ & ! f \.lz$ & ! f \.lzma$ & ! f \.7z$ & ! f \.xz$ & ! f \.(zip|ZIP)$ & t r
 z  xz the file
    exec xz -9 %f
 
@@ -323,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 -cd";;
-     *.gz)   P="gzip -cd";;
-     *.lz)   P="lzip -cd";;
-     *.lzma) P="lzma -cd";;
-     *.xz)   P="xz -cd";;
-     *.7z)   P="7zr x";;
-     *.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
@@ -379,9 +358,9 @@ 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
++ 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
    unset PRG
    case %F in
@@ -407,14 +386,44 @@ 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
    exec unzip.py %f
 
 + T r & F \.(zip|ZIP)$
-y  Extract from other zip with recoded filenames
+Y  Extract from other zip with recoded filenames
    exec unzip.py %D/%F
 
 + t r
@@ -447,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