.mc/menu: another fix for unrar

[dotfiles.git] / .mc / menu

diff --git a/.mc/menu b/.mc/menu
index 220f66fcafa72caae778ef5910b602a7d56a3c55..9c01575915fd533ff42670ac2b6227930c9721ea 100644 (file)
--- a/.mc/menu
+++ b/.mc/menu
@@ -58,8 +58,8 @@ T  fb2txt
    $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 with evince
-   evince %f &
+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
@@ -162,14 +162,14 @@ c  Play the current directory with smplayer
 
 + t r & f \.(m3u|mp3|MP3|cue|aac|ac3|ape|flac|ogg|OGG|pls|WAV|wav|wv|avi|AVI|flv|m2ts|m4v|mka|mkv|MKV|mov|MOV|mp4|MP4|mpg|MPG|vob|VOB|wma|wmv)$ | t t
 i  Audio/video info
-   exec mplayer2 -msglevel identify=6 -frames 0 %s
+   exec mplayer -msglevel identify=6 -frames 0 %s
 
 + t d & f (video_ts|VIDEO_TS)$
 i  DVD info
-   exec mplayer2 -dvd-device . dvd:// -msglevel identify=6 -frames 0
+   exec mplayer -dvd-device . dvd:// -msglevel identify=6 -frames 0
 
 + f \.(avi|AVI|flv|m2ts|m4v|mka|mkv|MKV|mov|MOV|mp4|MP4|mpg|MPG|vob|VOB|wma|wmv)$ | t t
-m  Play video file(s) with mplayer2
+m  Play video file(s) with mplayer
    mplayer %s &
 
 + f \.(m3u|mp3|MP3|cue|aac|ac3|ape|flac|ogg|OGG|pls|WAV|wav|wv|avi|AVI|flv|m2ts|m4v|mka|mkv|MKV|mov|MOV|mp4|MP4|mpg|MPG|vob|VOB|wma|wmv)$ | t t
@@ -177,7 +177,7 @@ M  Play audio/video with gmplayer
    gmplayer %s &
 
 + t d & f (video_ts|VIDEO_TS)$
-d  Play DVD directory with mplayer2
+d  Play DVD directory with mplayer
    mplayer -dvd-device . dvd:// &
 
 + t d & f (video_ts|VIDEO_TS)$
@@ -185,7 +185,7 @@ D  Play DVD directory with gmplayer
    gmplayer -dvd-device . dvd:// &
 
 + t d & f (video_ts|VIDEO_TS)$
-t  Play DVD title with mplayer2
+t  Play DVD title with mplayer
    title=%{Enter title}
    mplayer -dvd-device . dvd://"$title" &
 
@@ -195,7 +195,7 @@ T  Play DVD title with gmplayer
    gmplayer -dvd-device . dvd://"$title" &
 
 + t d
-p  Play directory with mplayer2
+p  Play directory with mplayer
    mplayer %f/* &
 
 + t d
@@ -399,7 +399,7 @@ x  Extract a compressed file
      *.xz)   P="xz -d";;
      *.tar)  P="tar xvpf";;
      *.zip|*.ZIP) P="unzip";;
-     *.rar|*.RAR) P="rar x -y";;
+     *.rar|*.RAR) P="unrar x -y";;
    esac
    exec $P %f
 
@@ -414,7 +414,7 @@ X  Extract another compressed file
      *.xz)   P="xz -d";;
      *.tar)  P="tar xvpf";;
      *.zip|*.ZIP) P="unzip";;
-     *.rar|*.RAR) P="rar x -y";;
+     *.rar|*.RAR) P="unrar x -y";;
    esac
    exec $P %D/%F
 
@@ -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