X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.mc%2Fmenu;h=b873fc966dc7c488736bfee2d3f9f609285ef906;hb=82111933fd71a71766d5331a436b61544b638115;hp=1161ca1542f36a7c901678fa87250fea8f2ebe0a;hpb=c44e2d64005700aaa9016aed0e92a8af7d672b79;p=dotfiles.git

diff --git a/.mc/menu b/.mc/menu
index 1161ca1..b873fc9 100644
--- 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}
@@ -220,6 +220,24 @@ g  Compress the current subdirectory to tar.gz
    cd .. && tar cvf - "$Pwd" | gzip -f9 > "$tar".tar.gz &&
    echo ../"$tar".tar.gz created.
 
++ t d & f ^\.\.$
+l  Compress the current subdirectory to tar.lzma
+   Pwd="`basename %d /`"
+   echo -n "Name of the distribution file (without extension) [$Pwd]: "
+   read tar
+   if [ "$tar"x = x ]; then tar="$Pwd"; fi
+   cd .. && tar cvf - "$Pwd" | lzma -f9 > "$tar".tar.lzma &&
+   echo ../"$tar".tar.lzma created.
+
++ t d & f ^\.\.$
+x  Compress the current subdirectory to tar.xz
+   Pwd="`basename %d /`"
+   echo -n "Name of the distribution file (without extension) [$Pwd]: "
+   read tar
+   if [ "$tar"x = x ]; then tar="$Pwd"; fi
+   cd .. && tar cvf - "$Pwd" | xz -f9 > "$tar".tar.xz &&
+   echo ../"$tar".tar.xz created.
+
 + t d & f ^\.\.$
 t  Compress the current subdirectory to tar
    Pwd="`basename %d /`"
@@ -247,29 +265,38 @@ 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)$
-z  bzip2 the file/directory
-   exec bzip2 -9 %f.bz2 %f
++ 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)$
-z  gzip the file/directory
-   exec gzip -9 %f.gz %f
++ ! 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
 
-+ ! f \.bz2$ & ! f \.gz$ & ! f \.lz$ & ! f \.lzma$ & ! f \.7z$ & ! f \.xz$ & ! f \.(zip|ZIP)$
-z  lzip the file/directory
-   exec lzip -9 %f.lz %f
++ ! 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)$
-z  lzma the file/directory
-   exec lzma -9 %f.lzma %f
++ ! 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)$ & 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 7z -9 %f.7z %f
+   exec 7zr a %f.7z %f
 
-+ ! f \.bz2$ & ! f \.gz$ & ! f \.lz$ & ! f \.lzma$ & ! f \.7z$ & ! f \.xz$ & ! f \.(zip|ZIP)$
-z  xz the file/directory
-   exec xz -9 %f.xz %f
++ ! 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
 
 + ! f \.bz2$ & ! f \.gz$ & ! f \.lz$ & ! f \.lzma$ & ! f \.7z$ & ! f \.xz$ & ! f \.(zip|ZIP)$
 z  zip the file/directory
@@ -340,7 +367,7 @@ x  Extract the contents of a compressed tar file
          PRG="lzma -dc"
       ;;
       *.tar.7z)
-         PRG="7za e -so"
+         PRG="7zr e -so"
       ;;
       *.tar.xz)
          PRG="xz -dc"
@@ -349,9 +376,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
@@ -368,7 +395,7 @@ X  Extract the contents of an other compressed tar file
          PRG="lzma -dc"
       ;;
       *.tar.7z)
-         PRG="7za e -so"
+         PRG="7zr e -so"
       ;;
       *.tar.xz)
          PRG="xz -dc"
@@ -377,40 +404,46 @@ X  Extract the contents of an other compressed tar file
       exit 1
       ;;
    esac
-   $PRG %D/%F | tar xvf -
+   $PRG %D/%F | tar xvpf -
 
-+ t r & f \.tar$
-u  Extract from tar
-   exec tar xpvf %f
++ 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
 
-+ t r & f \.(zip|ZIP)$
-u  Extract from zip
-   exec unzip %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 \.(rar|RAR)$
-u  Extract from rar
-   exec unrar x -y %f
-
-+ T r & F \.tar$
-u  Extract from other tar
-   exec tar xpvf %D/%F
-
-+ T r & F \.(zip|ZIP)$
-u  Extract from other zip
-   exec unzip %D/%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 & F \.(rar|RAR)$
-u  Extract from other rar
-   exec unrar x -y %D/%F
-
 + t r
 v  View via mailcap
    exec see %f
@@ -441,11 +474,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