From: Oleg Broytman Date: Sat, 17 Jan 2015 20:07:26 +0000 (+0300) Subject: mc.menu refactoring: change the order of menu items X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=5ea283d06574adbd2c83b3af1e4dd95a559cc9b9;p=dotfiles.git mc.menu refactoring: change the order of menu items Extract tar before (b/g/l/x/7)zip. --- diff --git a/.mc/menu b/.mc/menu index 901c90b..b2725a9 100644 --- a/.mc/menu +++ b/.mc/menu @@ -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 @@ -418,6 +388,36 @@ X Extract the contents of an other compressed tar file esac $PRG %D/%F | tar xvf - ++ 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 + + t r & f \.(zip|ZIP)$ y Extract from zip with recoded filenames exec unzip.py %f