X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.mc%2Fmenu;h=e0a77691f89bfc141eb053c794db754f54b55ed0;hb=cde4b52dad30a4053c9316c05f68e8ca2d9a633e;hp=730357a2aa3ec095ebc9a881749d902607e468d6;hpb=54ae58d0e2b74f337ddf10805aff6de07bd5e798;p=dotfiles.git

diff --git a/.mc/menu b/.mc/menu
index 730357a..e0a7769 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|djvu)(\.bz2|\.gz)?$
-e  View pdf/djvu with evince
-   evince %f &
-
 += t r & f \.(doc|DOC|rtf)$
 d  View doc with catdoc
    catdoc %f | ${PAGER:-more}
@@ -79,18 +79,22 @@ e  Edit doc with libreoffice
 
 += t r & f \.(docx|DOCX)$
 d  View docx with docx2txt
-   docx2txt %f - | ${PAGER:-more}
+   docx2txt %f - | iconv.py -f utf-8 | ${PAGER:-more}
+
++ t r & f \.(docx|DOCX)$
+e  Edit docx with libreoffice
+   libreoffice %f &
 
 += t r & f \.(xls|XLS)$
 x  View xls with xls2csv
    xls2csv %f | ${PAGER:-more}
 
-+ t r & f \.(bmp|BMP|gif|GIF|jpg|JPG|jpeg|JPEG|png|PNG|xpm)$ | t t
-= t r & f \.(bmp|BMP|gif|GIF|jpg|JPG|jpeg|JPEG|png|PNG|xpm)$
++ t r & f \.(bmp|BMP|gif|GIF|jpg|JPG|jpeg|JPEG|pbm|PBM|ppm|PPM|png|PNG|xbm|xpm)$ | t t
+= t r & f \.(bmp|BMP|gif|GIF|jpg|JPG|jpeg|JPEG|pbm|PBM|ppm|PPM|png|PNG|xbm|xpm)$
 i  View image(s) scaled
    xli -title "`echo %s | sed 's/ /_/g'`" -zoom auto %s &
 
-+ t r & f \.(bmp|BMP|gif|GIF|jpg|JPG|jpeg|JPEG|png|PNG|xpm)$ | t t
++ t r & f \.(bmp|BMP|gif|GIF|jpg|JPG|jpeg|JPEG|pbm|PBM|ppm|PPM|png|PNG|xbm|xpm)$ | t t
 I  View image(s) full size
    xli -title "`echo %s | sed 's/ /_/g'`" %s &
 
@@ -199,55 +203,106 @@ P  Play directory with gmplayer
    gmplayer %f/* &
 
 + t d & f ^\.\.$
-b  Make a .tar.bz2 release of the current directory
+b  Compress the current subdirectory to tar.bz2
    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" | bzip2 -f9 > "$tar".tar.bz2
+   cd .. && tar cvf - "$Pwd" | bzip2 -f9 > "$tar".tar.bz2 &&
    echo ../"$tar".tar.bz2 created.
 
 + t d & f ^\.\.$
-g  Make a .tar.gz release of the current directory
+g  Compress the current subdirectory to tar.gz
    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" | gzip -f9 > "$tar".tar.gz
+   cd .. && tar cvf - "$Pwd" | gzip -f9 > "$tar".tar.gz &&
    echo ../"$tar".tar.gz created.
 
 + t d & f ^\.\.$
-t  Make a .tar release of the current directory
+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 /`"
    echo -n "Name of the distribution file (without extension) [$Pwd]: "
    read tar
    if [ "$tar"x = x ]; then tar="$Pwd"; fi
-   cd .. && tar cvf - "$Pwd" > "$tar".tar
+   cd .. && tar cvf - "$Pwd" > "$tar".tar &&
    echo ../"$tar".tar created.
 
 + t d & f ^\.\.$
-z  Make a .zip release of the current directory
+z  Compress the current subdirectory to zip
    Pwd="`basename %d /`"
    echo -n "Name of the distribution file (without extension) [$Pwd]: "
    read zip
    if [ "$zip"x = x ]; then zip="$Pwd"; fi
-   cd .. && zip -r9 "$zip".zip "$Pwd"
+   cd .. && zip -r9 "$zip".zip "$Pwd" &&
    echo ../"$zip".zip created.
 
 + t d & f ^\.\.$
-y  Make a .zip release of the current directory with recoded filenames
+y  Compress the current subdirectory to zip with recoded filenames
    Pwd="`basename %d /`"
    echo -n "Name of the distribution file (without extension) [$Pwd]: "
    read zip
    if [ "$zip"x = x ]; then zip="$Pwd"; fi
-   cd .. && zip.py "$zip".zip "$Pwd"
+   cd .. && zip.py "$zip".zip "$Pwd" &&
    echo ../"$zip".zip created.
 
-+ ! 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|gz|lz|lzma|7z|xz|zip|ZIP)$ & t r
+z  bzip2 the file
+   exec bzip2 -9 %f
+
++ ! f \.(z|Z|bz2|gz|lz|lzma)|(tbz2|tgz|tz|zip|ZIP|rar|RAR|xz|7z)$ & t r
+z  gzip the file
+   exec gzip -9 %f
+
++ ! f \.(z|Z|bz2|gz|lz|lzma)|(tbz2|tgz|tz|zip|ZIP|rar|RAR|xz|7z)$ & t r
+z  lzip the file
+   exec lzip -9 %f
+
++ ! f \.(z|Z|bz2|gz|lz|lzma)|(tbz2|tgz|tz|zip|ZIP|rar|RAR|xz|7z)$ & t r
+z  lzma the file
+   exec lzma -9 %f
+
++ ! f \.(z|Z|bz2|gz|lz|lzma)|(tbz2|tgz|tz|zip|ZIP|rar|RAR|xz|7z)$ & t r
+z  7z the file/directory
+   exec 7zr a %f.7z %f
+
++ ! f \.(z|Z|bz2|gz|lz|lzma)|(tbz2|tgz|tz|zip|ZIP|rar|RAR|xz|7z)$ & t r
+z  xz the file
+   exec xz -9 %f
+
++ ! f \.(z|Z|bz2|gz|lz|lzma)|(tbz2|tgz|tz|zip|ZIP|rar|RAR|xz|7z)$ & t r
 z  zip the file/directory
    exec zip -r9 %f.zip %f
 
-+ ! f \.(\.|zip|ZIP)$
++ ! f \.(z|Z|bz2|gz|lz|lzma)|(tbz2|tgz|tz|zip|ZIP|rar|RAR|xz|7z)$ & t r
 y  zip the file/directory with recoded filename(s)
    exec zip.py %f.zip %f
 
@@ -261,98 +316,134 @@ Y  zip these files/directories with recoded filenames
    ZIP=%{Enter zip name}
    exec zip.py "$ZIP" %s
 
-+ t r & f \.tar\.bz2$
-u  Extract from tar-bzip2
-   exec bzip2 -cd %f | tar xpvf -
++ f \.tar\.bz2$ | f \.tar\.gz$ | f \.tgz$ | f \.tar\.lz$ | f \.tar\.lzma$ | f \.(zip|ZIP)$ | f \.(rar|RAR)$ | f \.7z$ | f \.xz$ & t r
+n  Create a directory for this archive
+   case %f in
+     *.tar.bz2)  D="`basename %f .tar.bz2`";;
+     *.tar.gz)   D="`basename %f .tar.gz`";;
+     *.tgz)      D="`basename %f .tgz`";;
+     *.tar.lz)   D="`basename %f .tar.lz`";;
+     *.tar.lzma) D="`basename %f .tar.lzma`";;
+     *.zip)      D="`basename %f .zip`";;
+     *.ZIP)      D="`basename %f .ZIP`";;
+     *.rar)      D="`basename %f .rar`";;
+     *.RAR)      D="`basename %f .RAR`";;
+     *.7z)       D="`basename %f .7z`";;
+     *.xz)       D="`basename %f .xz`";;
+   esac
+   exec mkdir "$D"
 
-+ f \.tar\.gz$ | f \.tgz$ & t r
-u  Extract from tar-gzip
-   exec gzip -cd %f | tar xpvf -
++ F \.tar\.bz2$ | F \.tar\.gz$ | F \.tgz$ | F \.tar\.lz$ | F \.tar\.lzma$ | F \.(zip|ZIP)$ | F \.(rar|RAR)$ | F \.7z$ | F \.xz$ & T r
+N  Create a directory for the other archive
+   case %D/%F in
+     *.tar.bz2)  D="`basename %F .tar.bz2`";;
+     *.tar.gz)   D="`basename %F .tar.gz`";;
+     *.tgz)      D="`basename %F .tgz`";;
+     *.tar.lz)   D="`basename %F .tar.lz`";;
+     *.tar.lzma) D="`basename %F .tar.lzma`";;
+     *.zip)      D="`basename %F .zip`";;
+     *.ZIP)      D="`basename %F .ZIP`";;
+     *.rar)      D="`basename %F .rar`";;
+     *.RAR)      D="`basename %F .RAR`";;
+     *.7z)       D="`basename %F .7z`";;
+     *.xz)       D="`basename %F .xz`";;
+   esac
+   exec mkdir "$D"
 
-+ t r & f \.tar$
-u  Extract from tar
-   exec tar xpvf %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
+   case %f in
+      *.tar.bz2)
+         PRG="bunzip2 -c"
+      ;;
+      *.tar.gz|*.tar.z|*.tgz|*.tpz|*.tar.Z)
+         PRG="gzip -dc"
+      ;;
+      *.tar.lz)
+         PRG="lzip -dc"
+      ;;
+      *.tar.lzma)
+         PRG="lzma -dc"
+      ;;
+      *.tar.7z)
+         PRG="7zr e -so"
+      ;;
+      *.tar.xz)
+         PRG="xz -dc"
+      ;;
+      *)
+      exit 1
+      ;;
+   esac
+   $PRG %f | tar xvpf -
 
-+ t r & f \.(zip|ZIP)$
-u  Extract from zip
-   exec unzip %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 an other compressed tar file
+   unset PRG
+   case %F in
+      *.tar.bz2)
+         PRG="bunzip2 -c"
+      ;;
+      *.tar.gz|*.tar.z|*.tgz|*.tpz|*.tar.Z)
+         PRG="gzip -dc"
+      ;;
+      *.tar.lz)
+         PRG="lzip -dc"
+      ;;
+      *.tar.lzma)
+         PRG="lzma -dc"
+      ;;
+      *.tar.7z)
+         PRG="7zr e -so"
+      ;;
+      *.tar.xz)
+         PRG="xz -dc"
+      ;;
+      *)
+      exit 1
+      ;;
+   esac
+   $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 \.7z$
-u  Extract from 7zip
-   exec 7zr x %f
-
-+ t r & f \.(rar|RAR)$
-u  Extract from rar
-   exec unrar x -y %f
-
-+ t r & f \.tar\.xz$
-u  Extract from tar-xz
-   exec xz -cd %f | tar xpvf -
-
-+ T r & F \.tar\.bz2$
-U  Extract from the other tar-bzip2
-   exec bzip2 -cd %D/%F | tar xpvf -
-
-+ F \.tar\.gz$ | F \.tgz$ & T r
-U  Extract from the other tar-gzip
-   exec gzip -cd %D/%F | tar xpvf -
-
-+ T r & F \.tar$
-U  Extract from the other tar
-   exec tar xpvf %D/%F
-
-+ T r & F \.(zip|ZIP)$
-U  Extract from the other zip
-   exec unzip %D/%F
-
 + T r & F \.(zip|ZIP)$
-Y  Extract from the 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 the other rar
-   exec unrar x -y %D/%F
-
-+ T r & F \.7z$
-U  Extract from 7zip
-   exec 7zr x %D/%F
-
-+ T r & F \.tar\.xz$
-U  Extract from tar-xz
-   exec xz -cd %D/%F | tar xpvf -
-
-+ f \.tar\.bz2$ | f \.tar\.gz$ | f \.tgz$ | f \.(zip|ZIP)$ | f \.(rar|RAR)$ | f \.7z$ & t r
-n  Create a directory for this archive
-   case %f in
-     *.tar.bz2) D="`basename %f .tar.bz2`";;
-     *.tar.gz) D="`basename %f .tar.gz`";;
-     *.tgz)    D="`basename %f .tgz`";;
-     *.zip)    D="`basename %f .zip`";;
-     *.ZIP)    D="`basename %f .ZIP`";;
-     *.rar)    D="`basename %f .rar`";;
-     *.RAR)    D="`basename %f .RAR`";;
-     *.7z)     D="`basename %f .7z`";;
-   esac
-   exec mkdir "$D"
-
-+ F \.tar\.bz2$ | F \.tar\.gz$ | F \.tgz$ | F \.(zip|ZIP)$ | F \.(rar|RAR)$ | F \.7z$ & T r
-N  Create a directory for this archive
-   case %F in
-     *.tar.bz2) D="`basename %F .tar.bz2`";;
-     *.tar.gz) D="`basename %F .tar.gz`";;
-     *.tgz)    D="`basename %F .tgz`";;
-     *.zip)    D="`basename %F .zip`";;
-     *.ZIP)    D="`basename %F .ZIP`";;
-     *.rar)    D="`basename %F .rar`";;
-     *.RAR)    D="`basename %F .RAR`";;
-     *.7z)     D="`basename %F .7z`";;
-   esac
-   exec mkdir "$D"
-
 + t r
 v  View via mailcap
    exec see %f
@@ -383,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