From: root Date: Mon, 15 May 2017 16:33:15 +0000 (+0200) Subject: saving uncommitted changes in /etc prior to emerge run X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=8a6b36f3e100b3cefc81798e8db18a8438d67cbd;p=config%2Fhelga%2Fetc.git saving uncommitted changes in /etc prior to emerge run --- diff --git a/.etckeeper b/.etckeeper index d5e2ea6..309efc5 100755 --- a/.etckeeper +++ b/.etckeeper @@ -1947,7 +1947,6 @@ maybe chmod 0644 'mc/filehighlight.ini' maybe chmod 0644 'mc/mc.default.keymap' maybe chmod 0644 'mc/mc.emacs.keymap' maybe chmod 0644 'mc/mc.ext' -maybe chmod 0644 'mc/mc.keymap' maybe chmod 0644 'mc/mc.menu' maybe chmod 0644 'mc/mc.menu.sr' maybe chmod 0644 'mc/mcedit.menu' diff --git a/mc/filehighlight.ini b/mc/filehighlight.ini index 8bc1722..7c59474 100644 --- a/mc/filehighlight.ini +++ b/mc/filehighlight.ini @@ -23,25 +23,24 @@ regexp=^core\\.*\\d*$ [temp] - extensions=tmp;$$$;~;bak + extensions=~;$$$;bak;tmp extensions_case=false regexp=(^#.*|.*~$) [archive] - extensions=gz;bz2;tar;tgz;rpm;Z;rar;zip;arj;cab;lzh;lha;zoo;arc;ark;xz;tbz;tbz2;7z;ace + extensions=7z;Z;ace;arc;arj;ark;bz2;cab;gz;lha;lz;lz4;lzh;lzma;rar;rpm;tar;tbz;tbz2;tgz;tlz;xz;zip;zoo [doc] - extensions=txt;doc;rtf;diz;ctl;me;ps;pdf;xml;xsd;xslt;dtd;html;shtml;htm;mail;msg;lsm;po;nroff;man;tex;sgml;css;text;letter;chm;docx;docm;xlsx;xlsm;pptx;pptm + extensions=chm;css;ctl;diz;doc;docm;docx;dtd;htm;html;letter;lsm;mail;man;me;msg;nroff;odp;ods;odt;pdf;po;ppt;pptm;pptx;ps;rtf;sgml;shtml;tex;text;txt;xls;xlsm;xlsx;xml;xsd;xslt [source] - extensions=c;h;cc;hh;cpp;cxx;hpp;asm;py;pl;pm;inc;cgi;php;phps;js;java;jav;jasm;sh;bash;diff;patch;pas;tcl;tk;awk;m4;st;mak;sl;ada;caml;ml;mli;mly;mll;mlp;sas;prg;hs;hi;erl + extensions=ada;asm;awk;bash;c;caml;cc;cgi;cpp;cxx;diff;erl;h;hh;hi;hpp;hs;inc;jasm;jav;java;js;m4;mak;ml;mli;mll;mlp;mly;pas;patch;php;phps;pl;pm;prg;py;rb;sas;sh;sl;st;tcl;tk;xq [media] - extensions=mp2;mp3;mpg;ogg;ogv;mpeg;wav;avi;asf;mov;mol;mpl;xm;mod;it;med;mid;midi;s3m;umx;vob;mkv;flv;mp4;m3u;flac;ape;wma;wmv;3gp;webm + extensions=3gp;ape;asf;avi;flac;flv;it;m3u;med;mid;midi;mkv;mod;mol;mov;mp2;mp3;mp4;mpeg;mpg;mpl;ogg;ogv;s3m;umx;vob;wav;webm;wma;wmv;xm [graph] - extensions=jpg;jpeg;gif;png;tif;pcx;bmp;xpm;xbm;eps;pic;rle;ico;wmf;omf;ai;cdr + extensions=ai;bmp;cdr;eps;gif;ico;jpeg;jpg;omf;pcx;pic;png;rle;svg;tif;tiff;webp;wmf;xbm;xcf;xpm [database] - extensions=dbf;mdn;db;mdb;dat;fox;dbx;mdx;sql;mssql;msql;ssql;pgsql;xls;cdx;dbi - + extensions=cdx;dat;db;dbf;dbi;dbx;fox;mdb;mdn;mdx;msql;mssql;pgsql;sql;ssql diff --git a/mc/mc.default.keymap b/mc/mc.default.keymap index 9698bd5..7d61ff8 100644 --- a/mc/mc.default.keymap +++ b/mc/mc.default.keymap @@ -32,6 +32,8 @@ SplitLess = alt-shift-left Shell = ctrl-o PutCurrentPath = alt-a PutOtherPath = alt-shift-a +PutCurrentSelected = alt-enter; ctrl-enter +PutCurrentFullSelected = ctrl-shift-enter ViewFiltered = alt-exclamation Select = kpplus Unselect = kpminus diff --git a/mc/mc.emacs.keymap b/mc/mc.emacs.keymap index cfce480..8b4842a 100644 --- a/mc/mc.emacs.keymap +++ b/mc/mc.emacs.keymap @@ -32,6 +32,8 @@ SplitLess = alt-shift-left Shell = ctrl-o PutCurrentPath = alt-a PutOtherPath = alt-shift-a +PutCurrentSelected = alt-enter; ctrl-enter +PutCurrentFullSelected = ctrl-shift-enter ViewFiltered = alt-exclamation Select = kpplus Unselect = kpminus diff --git a/mc/mc.ext b/mc/mc.ext index 5138ad4..8afa9fb 100644 --- a/mc/mc.ext +++ b/mc/mc.ext @@ -135,6 +135,16 @@ regex/\.t(ar\.lzma|lz)$ Open=%cd %p/utar:// View=%view{ascii} /usr/libexec/mc/ext.d/archive.sh view tar.lzma +# .tar.lz +shell/.tar.lz + Open=%cd %p/utar:// + View=%view{ascii} /usr/libexec/mc/ext.d/archive.sh view tar.lz + +# .tar.lz4, .tlz4 +regex/\.t(ar\.lz4|lz4)$ + Open=%cd %p/utar:// + View=%view{ascii} /usr/libexec/mc/ext.d/archive.sh view tar.lz4 + # .tar.xz, .txz regex/\.t(ar\.xz|xz)$ Open=%cd %p/utar:// @@ -190,6 +200,14 @@ shell/.cpio.Z Open=%cd %p/ucpio:// View=%view{ascii} /usr/libexec/mc/ext.d/archive.sh view cpio.z +shell/.cpio.lz + Open=%cd %p/ucpio:// + View=%view{ascii} /usr/libexec/mc/ext.d/archive.sh view cpio.lz + +shell/.cpio.lz4 + Open=%cd %p/ucpio:// + View=%view{ascii} /usr/libexec/mc/ext.d/archive.sh view cpio.lz4 + shell/.cpio.xz Open=%cd %p/ucpio:// View=%view{ascii} /usr/libexec/mc/ext.d/archive.sh view cpio.xz @@ -202,6 +220,11 @@ shell/i/.cpio Open=%cd %p/ucpio:// View=%view{ascii} /usr/libexec/mc/ext.d/archive.sh view cpio +# initrd +regex/^(initramfs.*\.img|initrd(-.+)?\.img(-.+)?)$ + Open=%cd %p/ucpio:// + View=%view{ascii} /usr/libexec/mc/ext.d/archive.sh view cpio + # 7zip archives (they are not man pages) shell/i/.7z Open=%cd %p/u7z:// @@ -216,6 +239,10 @@ regex/\.(diff|patch)(\.(gz|Z))$ Open=%cd %p/patchfs:// View=%view{ascii} /usr/libexec/mc/ext.d/archive.sh view gz +regex/\.(diff|patch)(\.xz)$ + Open=%cd %p/patchfs:// + View=%view{ascii} /usr/libexec/mc/ext.d/archive.sh view xz + # ls-lR regex/(^|\.)ls-?lR(\.gz|Z|bz2)$ Open=%cd %p/lslR:// @@ -360,6 +387,14 @@ regex/([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.bz2$ Open=/usr/libexec/mc/ext.d/text.sh open man.bz2 %var{PAGER:more} View=%view{ascii,nroff} /usr/libexec/mc/ext.d/text.sh view man.bz2 %var{PAGER:more} +regex/([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.lz$ + Open=/usr/libexec/mc/ext.d/text.sh open man.lz %var{PAGER:more} + View=%view{ascii,nroff} /usr/libexec/mc/ext.d/text.sh view man.lz %var{PAGER:more} + +regex/([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.lz4$ + Open=/usr/libexec/mc/ext.d/text.sh open man.lz4 %var{PAGER:more} + View=%view{ascii,nroff} /usr/libexec/mc/ext.d/text.sh view man.lz4 %var{PAGER:more} + regex/([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.lzma$ Open=/usr/libexec/mc/ext.d/text.sh open man.lzma %var{PAGER:more} View=%view{ascii,nroff} /usr/libexec/mc/ext.d/text.sh view man.lzma %var{PAGER:more} @@ -617,15 +652,15 @@ shell/.class View=%view{ascii} /usr/libexec/mc/ext.d/misc.sh view javaclass # Makefile -regex/[Mm]akefile$ +regex/^[Mm]akefile$ Open=make -f %f %{Enter parameters} # Imakefile shell/Imakefile - Open=/usr/libexec/mc/ext.d/misc.sh open imakefile + Open=xmkmf -a # Makefile.PL (MakeMaker) -regex/^Makefile.(PL|pl)$ +regex/^Makefile\.(PL|pl)$ Open=%var{PERL:perl} %f # sqlite3.db @@ -730,6 +765,21 @@ type/^compress Open=/usr/libexec/mc/ext.d/archive.sh view gz %var{PAGER:more} View=%view{ascii} /usr/libexec/mc/ext.d/archive.sh view gz +# lz +regex/\.lz$ + Open=/usr/libexec/mc/ext.d/archive.sh view lz %var{PAGER:more} + View=%view{ascii} /usr/libexec/mc/ext.d/archive.sh view lz + +# lz +type/^LZIP + Open=/usr/libexec/mc/ext.d/archive.sh view lz %var{PAGER:more} + View=%view{ascii} /usr/libexec/mc/ext.d/archive.sh view lz + +# lz4 +regex/\.lz4$ + Open=/usr/libexec/mc/ext.d/archive.sh view lz4 %var{PAGER:more} + View=%view{ascii} /usr/libexec/mc/ext.d/archive.sh view lz4 + # lzma regex/\.lzma$ Open=/usr/libexec/mc/ext.d/archive.sh view lzma %var{PAGER:more} diff --git a/mc/mc.keymap b/mc/mc.keymap deleted file mode 100644 index 9698bd5..0000000 --- a/mc/mc.keymap +++ /dev/null @@ -1,456 +0,0 @@ -[main] -Help = f1 -UserMenu = f2 -View = f3 -# ViewFile = -Edit = f4 -# EditForceInternal = -Copy = f5 -Move = f6 -MakeDir = f7 -Delete = f8 -Menu = f9 -Quit = f10 -MenuLastSelected = f19 -QuitQuiet = f20 -Find = alt-question -CdQuick = alt-c -HotList = ctrl-backslash -Reread = ctrl-r -DirSize = ctrl-space -Suspend = ctrl-z -Swap = ctrl-u -History = alt-h -# PanelListing = -PanelListingSwitch = alt-t -# PanelListingChange = -ShowHidden = alt-dot -SplitVertHoriz = alt-comma -SplitEqual = alt-equal -SplitMore = alt-shift-right -SplitLess = alt-shift-left -Shell = ctrl-o -PutCurrentPath = alt-a -PutOtherPath = alt-shift-a -ViewFiltered = alt-exclamation -Select = kpplus -Unselect = kpminus -SelectInvert = kpasterisk -ScreenList = alt-prime -# OptionsLayout = -# OptionsAppearance = -# OptionsPanel = -# OptionsConfirm = -# OptionsDisplayBits = -# OptionsVfs = -# LearnKeys = -# SaveSetup = -# EditExtensionsFile = -# EditFileHighlightFile = -# Filter = -# ConnectFish = -# ConnectFtp = -# ConnectSmb = -# Undelete = -ExtendedKeyMap = ctrl-x - -[main:xmap] -ChangeMode = c -ChangeOwn = o -CompareDirs = d -CompareFiles = ctrl-d -HotListAdd = h -LinkSymbolicEdit = ctrl-s -Link = l -LinkSymbolic = s -LinkSymbolicRelative = v -PanelInfo = i -PanelQuickView = q -ExternalPanelize = exclamation -VfsList = a -Jobs = j -PutCurrentPath = p -PutOtherPath = ctrl-p -PutCurrentTagged = t -PutOtherTagged = ctrl-t -PutCurrentLink = r -PutOtherLink = ctrl-r - -[panel] -Search = ctrl-s; alt-s -Mark = insert; ctrl-t -MarkUp = shift-up -MarkDown = shift-down -# MarkLeft = -# MarkRight = -Down = down; ctrl-n -Up = up; ctrl-p -Left = left -Right = right -PageUp = pgup; alt-v -PageDown = pgdn; ctrl-v -Enter = enter -PanelOtherCd = alt-o -PanelOtherCdLink = alt-l -ViewRaw = f13 -EditNew = f14 -CopySingle = f15 -MoveSingle = f16 -DeleteSingle = f18 -# SelectExt = -Select = alt-plus -Unselect = alt-minus -SelectInvert = alt-asterisk -CdChild = ctrl-pgdn -CdParent = ctrl-pgup -# CdParentSmart = -# Panelize = -History = alt-shift-h -HistoryNext = alt-u -HistoryPrev = alt-y -BottomOnScreen = alt-j -MiddleOnScreen = alt-r -TopOnScreen = alt-g -PanelOtherSync = alt-i -SelectCodepage = alt-e -Top = alt-lt; home; a1 -Bottom = alt-gt; end; c1 -# Sort = -# SortPrev = -# SortNext = -# SortReverse = -# SortByName = -# SortByExt = -# SortBySize = -# SortByMTime = -# ScrollLeft = -# ScrollRight = - -[dialog] -Ok = enter -Cancel = f10; esc; ctrl-g -Up = left; up -#Left = left; up -Down = right; down -#Right = right; down -Help = f1 -Suspend = ctrl-z -Refresh = ctrl-l -ScreenList = alt-prime -ScreenNext = alt-rbrace -ScreenPrev = alt-lbrace - -[input] -Home = ctrl-a; alt-lt; home; a1 -End = ctrl-e; alt-gt; end; c1 -Left = left; alt-left; ctrl-b -Right = right; alt-right; ctrl-f -WordLeft = ctrl-left; alt-b -WordRight = ctrl-right; alt-f -Backspace = backspace; ctrl-h -Delete = delete; ctrl-d -DeleteToWordBegin = alt-backspace -DeleteToWordEnd = alt-d -# Mark = -Remove = ctrl-w -# Cut = -Store = alt-w -# Paste = -Yank = ctrl-y -DeleteToEnd = ctrl-k -HistoryPrev = alt-p; ctrl-down -HistoryNext = alt-n; ctrl-up -History = alt-h -Complete = alt-tab -# Clear = -MarkLeft = shift-left -MarkRight = shift-right -MarkToWordBegin = ctrl-shift-left -MarkToWordEnd = ctrl-shift-right -MarkToHome = shift-home -MarkToEnd = shift-end - -[listbox] -Up = up; ctrl-p -Down = down; ctrl-n -Top = home; alt-lt; a1 -Bottom = end; alt-gt; c1 -PageUp = pgup; alt-v -PageDown = pgdn; ctrl-v -Delete = delete; d -Clear = shift-delete; shift-d - -[tree] -Help = f1 -Reread = f2; ctrl-r -Forget = f3 -ToggleNavigation = f4 -Copy = f5 -Move = f6 -Up = up; ctrl-p -Down = down; ctrl-n -Left = left -Right = right -Top = home; alt-lt; a1 -Bottom = end; alt-gt; c1 -PageUp = pgup; alt-v -PageDown = pgdn; ctrl-v -Enter = enter -Search = ctrl-s; alt-s -Delete = f8; delete - -[help] -Help = f1 -Index = f2; c -Back = f3; left; l -Quit = f10; esc -Up = up; ctrl-p -Down = down; ctrl-n -PageDown = f; space; pgdn; ctrl-v -PageUp = b; pgup; alt-v; backspace -HalfPageDown = d -HalfPageUp = u -Top = home; ctrl-home; ctrl-pgup; a1; alt-lt; g -Bottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g -Enter = right; enter -LinkNext = tab -LinkPrev = alt-tab -NodeNext = n -NodePrev = p - -[editor] -Store = ctrl-insert -Paste = shift-insert -Cut = shift-delete -Up = up -Down = down -Left = left -Right = right -WordLeft = ctrl-left; ctrl-z -WordRight = ctrl-right; ctrl-x -Enter = enter -Return = shift-enter; ctrl-enter; ctrl-shift-enter -BackSpace = backspace; ctrl-h -Delete = delete; ctrl-d -PageUp = pgup -PageDown = pgdn -Home = home -End = end -Tab = tab; shift-tab; ctrl-tab; ctrl-shift-tab -Undo = ctrl-u -Redo = alt-r -Top = ctrl-home; alt-lt -Bottom = ctrl-end; alt-gt -ScrollUp = ctrl-up -ScrollDown = ctrl-down -TopOnScreen = ctrl-pgup -BottomOnScreen = ctrl-pgdn -DeleteToWordBegin = alt-backspace -DeleteToWordEnd = alt-d -DeleteLine = ctrl-y -DeleteToEnd = ctrl-k -# DeleteToHome = -# ParagraphUp = -# ParagraphDown = -Save = f2 -# EditFile = -EditNew = ctrl-n -SaveAs = f12; ctrl-f2 -# Close = -Mark = f3 -Copy = f5 -Move = f6 -Remove = f8 -# MarkLine = -# MarkWord = -# MarkAll = -# Unmark = -Search = f7 -SearchContinue = f17 -# BlockShiftLeft = -# BlockShiftRight = -MarkPageUp = shift-pgup -MarkPageDown = shift-pgdn -MarkLeft = shift-left -MarkRight = shift-right -MarkToWordBegin = ctrl-shift-left -MarkToWordEnd = ctrl-shift-right -MarkUp = shift-up -MarkDown = shift-down -MarkToHome = shift-home -MarkToEnd = shift-end -MarkToFileBegin = ctrl-shift-home -MarkToFileEnd = ctrl-shift-end -MarkToPageBegin = ctrl-shift-pgup -MarkToPageEnd = ctrl-shift-pgdn -MarkScrollUp = ctrl-shift-up -MarkScrollDown = ctrl-shift-down -# MarkParagraphUp = -# MarkParagraphDown = -MarkColumnPageUp = alt-pgup -MarkColumnPageDown = alt-pgdn -MarkColumnLeft = alt-left -MarkColumnRight = alt-right -MarkColumnUp = alt-up -MarkColumnDown = alt-down -# MarkColumnScrollUp = -# MarkColumnScrollDown = -# MarkColumnParagraphUp = -# MarkColumnParagraphDown = -BlockSave = ctrl-f -MarkColumn = f13 -Replace = f4 -ReplaceContinue = f14 -Complete = alt-tab -InsertFile = f15 -Quit = f10; esc -InsertOverwrite = insert -Help = f1 -# Date = -Refresh = ctrl-l -Goto = alt-l -Sort = alt-t -Mail = alt-m -ParagraphFormat = alt-p -MatchBracket = alt-b -ExternalCommand = alt-u -UserMenu = f11 -Menu = f9 -Bookmark = alt-k -BookmarkFlush = alt-o -BookmarkNext = alt-j -BookmarkPrev = alt-i -# History = -Shell = ctrl-o -InsertLiteral = ctrl-q -# MacroStartRecord = -# MacroStopRecord = -MacroStartStopRecord = ctrl-r -# MacroDelete = -ShowNumbers = alt-n -ShowTabTws = alt-underline -SyntaxOnOff = ctrl-s -# SyntaxChoose = -# ShowMargin = -Find = alt-enter -FilePrev = alt-minus -FileNext = alt-plus -# RepeatStartStopRecord = -SelectCodepage = alt-e -# Options = -# OptionsSaveMode = -# SpellCheck = -SpellCheckCurrentWord = ctrl-p -# SpellCheckSelectLang = -# LearnKeys = -# WindowMove = -# WindowResize = -# WindowFullscreen = -# WindowList = -# WindowNext = -# WindowPrev = -# ExtendedKeyMap = - -[viewer] -Help = f1 -WrapMode = f2 -Quit = f3; f10; q; esc -HexMode = f4 -Goto = f5 -Search = f7 -SearchForward = slash -SearchBackward = question -SearchContinue = f17; n -SearchForwardContinue = ctrl-s -SearchBackwardContinue = ctrl-r -MagicMode = f8 -NroffMode = f9 -Home = ctrl-a -End = ctrl-e -Left = h; left -Right = l; right -LeftQuick = ctrl-left -RightQuick = ctrl-right -Up = k; y; insert; up; ctrl-p -Down = j; e; delete; down; enter; ctrl-n -PageDown = f; space; pgdn; ctrl-v -PageUp = b; pgup; alt-v; backspace -HalfPageDown = d -HalfPageUp = u -Top = home; ctrl-home; ctrl-pgup; a1; alt-lt; g -Bottom = end; ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g -BookmarkGoto = m -Bookmark = r -FileNext = ctrl-f -FilePrev = ctrl-b -SelectCodepage = alt-e -Shell = ctrl-o -Ruler = alt-r - -[viewer:hex] -Help = f1 -HexEditMode = f2 -Quit = f3; f10; q; esc -HexMode = f4 -Goto = f5 -Save = f6 -Search = f7 -SearchForward = slash -SearchBackward = question -SearchContinue = f17; n -SearchForwardContinue = ctrl-s -SearchBackwardContinue = ctrl-r -MagicMode = f8 -NroffMode = f9 -ToggleNavigation = tab -Home = ctrl-a; home -End = ctrl-e; end -Left = b; left -Right = f; right -Up = k; y; up -Down = j; delete; down -PageDown = pgdn; ctrl-v -PageUp = pgup; alt-v -Top = ctrl-home; ctrl-pgup; a1; alt-lt; g -Bottom = ctrl-end; ctrl-pgdn; c1; alt-gt; shift-g - -[diffviewer] -ShowSymbols = alt-s; s -ShowNumbers = alt-n; l -SplitFull = f -SplitEqual = equal -SplitMore = gt -SplitLess = lt -Tab2 = 2 -Tab3 = 3 -Tab4 = 4 -Tab8 = 8 -Swap = ctrl-u -Redo = ctrl-r -HunkNext = n; enter; space -HunkPrev = p; backspace -Goto = g; shift-g -Save = f2 -Edit = f4 -EditOther = f14 -Merge = f5 -MergeOther = f15 -Search = f7 -SearchContinue = f17 -Options = f9 -Top = ctrl-home -Bottom = ctrl-end -Down = down -Up = up -LeftQuick = ctrl-left -RightQuick = ctrl-right -Left = left -Right = right -PageDown = pgdn -PageUp = pgup -Home = home -End = end -Help = f1 -Quit = f10; q; shift-q; esc -Shell = ctrl-o -SelectCodepage = alt-e diff --git a/mc/mc.keymap b/mc/mc.keymap new file mode 120000 index 0000000..2472022 --- /dev/null +++ b/mc/mc.keymap @@ -0,0 +1 @@ +mc.default.keymap \ No newline at end of file diff --git a/mc/mc.menu b/mc/mc.menu index 5ec140c..151bbd8 100644 --- a/mc/mc.menu +++ b/mc/mc.menu @@ -1,363 +1,356 @@ shell_patterns=0 + +############################################################################## +# %% The % character +# %f The current file (if non-local vfs, file will be copied locally and +# %f will be full path to it) +# %p The current file +# %d The current working directory +# %s "Selected files"; the tagged files if any, otherwise the current file +# %t Tagged files +# %u Tagged files (and they are untagged on return from expand_format) +# %view Runs the commands and pipes standard output to the view command +# If %view is immediately followed by '{', recognize keywords +# ascii, hex, nroff and unform +# +# If the format letter is in uppercase, it refers to the other panel +# +# With a number followed the % character you can turn quoting on (default) +# and off. For example: +# %f quote expanded macro +# %1f ditto +# %0f don't quote expanded macro +############################################################################## + + ! t t @ Do something on the current file - CMD=%{Enter command} - $CMD %f + CMD=%{Enter command} + $CMD %f + t t @ Do something on the tagged files - set %t; CMD=%{Enter command} - while [ -n "$1" ]; do - $CMD "$1" - shift - done - + CMD=%{Enter command} + for i in %t ; do + $CMD "$i" + done 0 Edit a bug report and send it to root - I=`mktemp "${MC_TMPDIR:-/tmp}/mail.XXXXXX"` || exit 1 - ${EDITOR-vi} "$I" - test -r $I && mail root < $I - rm -f "$I" + I=`mktemp "${MC_TMPDIR:-/tmp}/mail.XXXXXX"` || exit 1 + ${EDITOR-vi} "$I" + test -r "$I" && mail root < "$I" + rm -f "$I" =+ f \.1$ | f \.3$ | f \.4$ | f \.5$ | f \.6$ | f \.7$ | f \.8$ | f \.man$ & t r 1 Display the file with roff -man - %view{ascii,nroff} roff -c -Tlatin1 -mandoc %f + %view{ascii,nroff} roff -c -Tlatin1 -mandoc %f 2 Call the info hypertext browser info = t d 3 Compress the current subdirectory (tar.gz) - Pwd=`basename %d /` - echo -n "Name of the compressed file (without extension) [$Pwd]: " - read tar - if [ "$tar"x = x ]; then tar="$Pwd"; fi - cd .. && \ - tar cf - "$Pwd" | gzip -f9 > "$tar.tar.gz" && \ - echo "../$tar.tar.gz created." + Pwd=`basename %d /` + echo -n "Name of the compressed file (without extension) [$Pwd]: " + read tar + [ "$tar"x = x ] && tar="$Pwd" + cd .. && \ + tar cf - "$Pwd" | gzip -f9 > "$tar.tar.gz" && \ + echo "../$tar.tar.gz created." 4 Compress the current subdirectory (tar.bz2) - Pwd=`basename %d /` - echo -n "Name of the compressed file (without extension) [$Pwd]: " - read tar - if [ "$tar"x = x ]; then tar="$Pwd"; fi - cd .. && \ - tar cf - "$Pwd" | bzip2 -f > "$tar.tar.bz2" && \ - echo "../$tar.tar.bz2 created." + Pwd=`basename %d /` + echo -n "Name of the compressed file (without extension) [$Pwd]: " + read tar + [ "$tar"x = x ] && tar="$Pwd" + cd .. && \ + tar cf - "$Pwd" | bzip2 -f > "$tar.tar.bz2" && \ + echo "../$tar.tar.bz2 created." 5 Compress the current subdirectory (tar.7z) - Pwd=`basename %d /` - echo -n "Name of the compressed file (without extension) [$Pwd]: " - read tar - if [ "$tar"x = x ]; then tar="$Pwd"; fi - cd .. && \ - tar cf - "$Pwd" | 7za a -si "$tar.tar.7z" && \ - echo "../$tar.tar.7z created." + Pwd=`basename %d /` + echo -n "Name of the compressed file (without extension) [$Pwd]: " + read tar + [ "$tar"x = x ] && tar="$Pwd" + cd .. && \ + tar cf - "$Pwd" | 7za a -si "$tar.tar.7z" && \ + echo "../$tar.tar.7z created." 6 Compress the current subdirectory (tar.xz) - Pwd=`basename %d /` - echo -n "Name of the compressed file (without extension) [$Pwd]: " - read tar - if [ "$tar"x = x ]; then tar="$Pwd"; fi - cd .. && \ - tar cf - "$Pwd" | xz -f > "$tar.tar.xz" && \ - echo "../$tar.tar.xz created." + Pwd=`basename %d /` + echo -n "Name of the compressed file (without extension) [$Pwd]: " + read tar + [ "$tar"x = x ] && tar="$Pwd" + cd .. && \ + tar cf - "$Pwd" | xz -f > "$tar.tar.xz" && \ + echo "../$tar.tar.xz created." = f \.c$ & t r + f \.c$ & t r & ! t t c Compile and link current .c file - make `basename %f .c` 2>/dev/null || cc -O -o `basename %f .c` %f + make "`basename %f .c`" 2>/dev/null || cc -O -o "`basename %f .c`" %f + t r & ! t t a Append file to opposite - cat %f >> %D/%f + cat %f >> %D/%f + t t A Append files to opposite files - set %t - while [ -n "$1" ]; do - cat "$1" >> "%D/$1" - shift - done + for i in %t ; do + cat "$i" >> %D/"$i" + done + t r & ! t t d Delete file if a copy exists in the other directory. - if [ "%d" = "%D" ]; then - echo "The two directories must be different." - exit 1 - fi - if [ -f %D/%f ]; then # if two of them, then - if cmp -s %D/%f %f; then - rm %f && echo "%f: DELETED." - else - echo "%f and %D/%f differ: NOT deleted." - echo -n "Press RETURN " - read key - fi - else - echo "%f: No copy in %D/%f: NOT deleted." + if [ %d = %D ]; then + echo "The two directories must be different." + exit 1 + fi + if [ -f %D/%f ]; then # if two of them, then + if cmp -s %D/%f %f; then + rm %f && echo %f": DELETED." + else + echo %f" and "%D/%f" differ: NOT deleted." + echo -n "Press RETURN " + read key + fi + else + echo %f": No copy in "%D/%f": NOT deleted." fi + t t D Delete tagged files if a copy exists in the other directory. - if [ "%d" = "%D" ]; then - echo "The two directores must be different." - exit 1 - fi - for i in %t - do - if [ -f "%D/$i" ]; then - SUM1="`sum \"$i\"`" - SUM2="`sum \"%D/$i\"`" - if [ "$SUM1" = "$SUM2" ]; then - rm "$i" && echo "${i}: DELETED." - else - echo "$i and %D/$i differ: NOT deleted." - fi - else - echo "$i has no copy in %D: NOT deleted." - fi + if [ %d = %D ]; then + echo "The two directores must be different." + exit 1 + fi + for i in %t ; do + if [ -f %D/"$i" ]; then + SUM1=`sum "$i"` + SUM2=`sum %D/"$i"` + if [ "$SUM1" = "$SUM2" ]; then + rm "$i" && echo "${i}: DELETED." + else + echo "$i and "%D"/$i differ: NOT deleted." + fi + else + echo "$i has no copy in "%D": NOT deleted." + fi done m View manual page - MAN=%{Enter manual name} - %view{ascii,nroff} MANROFFOPT='-c -Tlatin1' MAN_KEEP_FORMATTING=1 man -P cat $MAN + MAN=%{Enter manual name} + %view{ascii,nroff} MANROFFOPT='-c -Tlatin1' MAN_KEEP_FORMATTING=1 man -P cat "$MAN" = f \.gz$ & t r + ! t t n Inspect gzip'ed newsbatch file - dd if=%f bs=1 skip=12|zcat|${PAGER-more} + dd if=%f bs=1 skip=12 | zcat | ${PAGER-more} # assuming the cunbatch header is 12 bytes long. = t r & + ! t t h Strip headers from current newsarticle - CHECK=`awk '{print $1 ; exit}' %f` 2>/dev/null - case "$CHECK" in - Newsgroups:|Path:) - I=`mktemp "${MC_TMPDIR:-/tmp}/news.XXXXXX"` || exit 1 - cp %f "$I" && sed '/^'"$CHECK"' /,/^$/d' "$I" > %f - [ "$?" = "0" ] && rm "$I" - echo "%f: header removed." - ;; - *) - echo "%f is not a news article." - ;; - esac + CHECK=`awk '{print $1 ; exit}' %f` 2>/dev/null + case "$CHECK" in + Newsgroups:|Path:) + I=`mktemp "${MC_TMPDIR:-/tmp}/news.XXXXXX"` || exit 1 + cp %f "$I" && sed '/^'"$CHECK"' /,/^$/d' "$I" > %f + [ "$?" = "0" ] && rm "$I" + echo %f": header removed." + ;; + *) + echo %f" is not a news article." + ;; + esac + t t H Strip headers from the marked newsarticles - set %t - while [ -n "$1" ]; do - CHECK=`awk '{print $1 ; exit}' $1` 2>/dev/null - WFILE=`mktemp "${MC_TMPDIR:-/tmp}/news.XXXXXX"` || exit 1 - case "$CHECK" in - Newsgroups:|Path:) - cp "$1" "$WFILE" && sed '/^'"$CHECK"' /,/^$/d' "$WFILE" > "$1" - if [ "$?" = "0" ]; then - rm "$WFILE"; echo "$1 header removed. OK." - else - echo "Oops! Please check $1 against $WFILE." - fi - ;; - *) - echo "$1 skipped: Not a news article." - ;; - esac - shift - done + for i in %t ; do + CHECK=`awk '{print $1 ; exit}' "$i"` 2>/dev/null + WFILE=`mktemp "${MC_TMPDIR:-/tmp}/news.XXXXXX"` || exit 1 + case "$CHECK" in + Newsgroups:|Path:) + cp "$i" "$WFILE" && sed '/^'"$CHECK"' /,/^$/d' "$WFILE" > "$i" + if [ "$?" = "0" ]; then + rm "$WFILE"; echo "$i header removed. OK." + else + echo "Oops! Please check $i against $WFILE." + fi + ;; + *) + echo "$i skipped: Not a news article." + ;; + esac + done = t r + ! t t r Copy file to remote host - echo -n "To which host?: " + echo -n "To which host?: " read Host echo -n "To which directory on $Host?: " read Dir - rcp -p %f "${Host}:$Dir" + rcp -p %f "${Host}:${Dir}" + t t R Copy files to remote host (no error checking) - echo -n "Copy files to which host?: " + echo -n "Copy files to which host?: " read Host echo -n "To which directory on $Host? :" read Dir - rcp -pr %u "${Host}:$Dir" + rcp -pr %u "${Host}:${Dir}" = f \.tex$ & t r + f \.tex$ & t r & ! t t t Run latex on file and show it with xdvi - latex %f && xdvi `basename %f .tex`.dvi + latex %f && xdvi "`basename %f .tex`".dvi =+ f ^part | f ^Part | f uue & t r + t t U Uudecode marked news articles (needs work) - set %t ( - while [ -n "$1" ]; do # strip headers - FIRST=`awk '{print $1 ; exit}' "$1"` - cat "$1" | sed '/^'"$FIRST"' /,/^$/d'; shift - done - ) |sed '/^$/d' |sed -n '/^begin 6/,/^end$/p' | uudecode - if [ "$?" != "0" ]; then - echo "Cannot decode %t." - fi - echo "Please test the output file before deleting anything." - -=+ 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 + for i in %t ; do # strip headers + FIRST=`awk '{print $1 ; exit}' "$i"` + cat "$i" | sed '/^'"$FIRST"' /,/^$/d' + done + ) | sed '/^$/d' | sed -n '/^begin 6/,/^end$/p' | uudecode + if [ "$?" != "0" ]; then + echo "Cannot decode "%t"." + fi + echo "Please test the output file before deleting anything." + +=+ f \.tar\.gz$ | f \.tar\.z$ | f \.tgz$ | f \.tpz$ | f \.tar\.lz$ | f \.tar\.lz4$ | 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.lzma) - PRG="lzma -dc" - ;; - *.tar.lz) - PRG="lzip -dc" - ;; - *.tar.xz) - PRG="xz -dc" - ;; - *.tar.7z) - PRG="7za e -so" - ;; - *) - exit 1 - ;; - esac - $PRG %f | tar xvf - + unset PRG + case %f in + *.tar.7z) PRG="7za e -so";; + *.tar.bz2) PRG="bunzip2 -c";; + *.tar.gz|*.tar.z|*.tgz|*.tpz|*.tar.Z) PRG="gzip -dc";; + *.tar.lz) PRG="lzip -dc";; + *.tar.lz4) PRG="lz4 -dc";; + *.tar.lzma) PRG="lzma -dc";; + *.tar.xz) PRG="xz -dc";; + *) exit 1;; + esac + $PRG %f | tar xvf - = t r + ! t t y Gzip or gunzip current file unset DECOMP - case %f in - *.gz) DECOMP=-d;; - *.[zZ]) DECOMP=-d;; - esac - gzip $DECOMP -v %f + case %f in + *.gz|*.[zZ]) DECOMP=-d;; + esac + gzip "$DECOMP" -v %f + t t Y Gzip or gunzip tagged files - for i in %t - do - unset DECOMP - case "$i" in - *.gz) DECOMP=-d;; - *.[zZ]) DECOMP=-d;; - esac - gzip $DECOMP -v "$i" + for i in %t ; do + unset DECOMP + case "$i" in + *.gz|*.[zZ]) DECOMP=-d;; + esac + gzip "$DECOMP" -v "$i" done + ! t t b Bzip2 or bunzip2 current file unset DECOMP - case %f in - *.bz2) DECOMP=-d;; - esac - bzip2 $DECOMP -v %f + case %f in + *.bz2) DECOMP=-d;; + esac + bzip2 "$DECOMP" -v %f + t t B Bzip2 or bunzip2 tagged files - for i in %t - do - unset DECOMP - case "$i" in - *.bz2) DECOMP=-d;; - esac - bzip2 $DECOMP -v "$i" + for i in %t ; do + unset DECOMP + case "$i" in + *.bz2) DECOMP=-d;; + esac + bzip2 "$DECOMP" -v "$i" done + f \.tar.gz$ | f \.tgz$ | f \.tpz$ | f \.tar.Z$ | f \.tar.z$ | f \.tar.bz2$ | f \.tar.F$ & t r & ! t t z Extract compressed tar file to subdirectory - unset D - set gzip -cd - case %f in - *.tar.gz) D="`basename %f .tar.gz`";; - *.tgz) D="`basename %f .tgz`";; - *.tpz) D="`basename %f .tpz`";; - *.tar.Z) D="`basename %f .tar.Z`";; - *.tar.z) D="`basename %f .tar.z`";; - *.tar.bz2) D="`basename %f .tar.bz2`"; set bunzip2 -c ;; - *.tar.F) D="`basename %f .tar.F`"; set freeze -dc; - esac - mkdir "$D"; cd "$D" && ("$1" "$2" ../%f | tar xvf -) + unset D + set gzip -cd + case %f in + *.tar.F) D=`basename %f .tar.F`; set freeze -dc;; + *.tar.Z) D=`basename %f .tar.Z`;; + *.tar.bz2) D=`basename %f .tar.bz2`; set bunzip2 -c;; + *.tar.gz) D=`basename %f .tar.gz`;; + *.tar.z) D=`basename %f .tar.z`;; + *.tgz) D=`basename %f .tgz`;; + *.tpz) D=`basename %f .tpz`;; + esac + mkdir "$D"; cd "$D" && ("$1" "$2" ../%f | tar xvf -) + t t Z Extract compressed tar files to subdirectories - for i in %t - do - set gzip -dc - unset D - case "$i" in - *.tar.gz) D="`basename $i .tar.gz`";; - *.tgz) D="`basename $i .tgz`";; - *.tpz) D="`basename $i .tpz`";; - *.tar.Z) D="`basename $i .tar.Z`";; - *.tar.z) D="`basename $i .tar.z`";; - *.tar.F) D="`basename $i .tar.F`"; set freeze -dc;; - *.tar.bz2) D="`basename $i .tar.bz2`"; set bunzip2 -c;; + for i in %t ; do + set gzip -dc + unset D + case "$i" in + *.tar.F) D=`basename "$i" .tar.F`; set freeze -dc;; + *.tar.Z) D=`basename "$i" .tar.Z`;; + *.tar.bz2) D=`basename "$i" .tar.bz2`; set bunzip2 -c;; + *.tar.gz) D=`basename "$i" .tar.gz`;; + *.tar.z) D=`basename "$i" .tar.z`;; + *.tgz) D=`basename "$i" .tgz`;; + *.tpz) D=`basename "$i" .tpz`;; esac - mkdir "$D"; (cd "$D" && "$1" "$2" "../$i" | tar xvf -) + mkdir "$D"; (cd "$D" && "$1" "$2" "../$i" | tar xvf -) done + f \.gz$ | f \.tgz$ | f \.tpz$ | f \.Z$ | f \.z$ | f \.bz2$ & t r & ! t t c Convert gz<->bz2, tar.gz<->tar.bz2 & tgz->tar.bz2 - unset D - unset EXT - case %f in - *.tgz) EXT=tgz;; - *.tpz) EXT=tpz;; - *.Z) EXT=Z;; - *.z) EXT=z;; - *.gz) EXT=gz;; - *.bz2) EXT=bz2;; - esac - case $EXT in - tgz|tpz) D="`basename %f .$EXT`.tar";; - gz|Z|z) D="`basename %f .$EXT`";; - bz2) D="`basename %f .bz2`";; + unset D + unset EXT + case %f in + *.Z) EXT=Z;; + *.bz2) EXT=bz2;; + *.gz) EXT=gz;; + *.tgz) EXT=tgz;; + *.tpz) EXT=tpz;; + *.z) EXT=z;; + esac + case "$EXT" in + bz2|Z|gz|z) D=`basename %f ."$EXT"`;; + tgz|tpz) D=`basename %f ."$EXT"`.tar;; esac if [ "$EXT" = "bz2" ]; then - bunzip2 -v %f ; gzip -f9 -v "$D" - else - gunzip -v %f ; bzip2 -v "$D" - fi + bunzip2 -v %f + gzip -f9 -v "$D" + else + gunzip -v %f + bzip2 -v "$D" + fi + t t C Convert gz<->bz2, tar.gz<->tar.bz2 & tgz->tar.bz2 - set %t - while [ -n "$1" ] - do - unset D - unset EXT - case "$1" in - *.tgz) EXT=tgz;; - *.tpz) EXT=tpz;; - *.Z) EXT=Z;; - *.z) EXT=z;; - *.gz) EXT=gz;; - *.bz2) EXT=bz2;; - esac - case $EXT in - tgz) D="`basename $1 .tgz`.tar";; - tpz) D="`basename $1 .tpz`.tar";; - gz|Z|z) D="`basename $1 .$EXT`";; - bz2) D="`basename $1 .bz2`";; - esac - if [ "$EXT" = "bz2" ]; then - bunzip2 -v "$1" - gzip -f9 -v "$D" - else - gunzip -v "$1" - bzip2 -v "$D" - fi - shift + for i in %t ; do + unset D + unset EXT + case "$i" in + *.Z) EXT=Z;; + *.bz2) EXT=bz2;; + *.gz) EXT=gz;; + *.tgz) EXT=tgz;; + *.tpz) EXT=tpz;; + *.z) EXT=z;; + esac + case "$EXT" in + bz2|Z|gz|z) D=`basename "$i" ."$EXT"`;; + tgz|tpz) D=`basename "$i" ."$EXT"`.tar;; + esac + if [ "$EXT" = "bz2" ]; then + bunzip2 -v "$i" + gzip -f9 -v "$D" + else + gunzip -v "$i" + bzip2 -v "$D" + fi done + x /usr/bin/open | x /usr/local/bin/open & x /bin/sh diff --git a/mc/mcedit.menu b/mc/mcedit.menu index 7800202..984102f 100644 --- a/mc/mcedit.menu +++ b/mc/mcedit.menu @@ -471,13 +471,13 @@ o Open bash to next free console u Upper case selection TMPFILE=`mktemp ${MC_TMPDIR:-/tmp}/up.XXXXXX` || exit 1 cat %b > $TMPFILE - cat $TMPFILE| sed 's/\(.*\)/\U\1/' >%b + sed 's/\(.*\)/\U\1/' $TMPFILE >%b rm -f $TMPFILE l Lower case selection TMPFILE=`mktemp ${MC_TMPDIR:-/tmp}/up.XXXXXX` || exit 1 cat %b > $TMPFILE - cat $TMPFILE| sed 's/\(.*\)/\U\1/' >%b + sed 's/\(.*\)/\L\1/' $TMPFILE >%b rm -f $TMPFILE #-------------------------- End of common section ----------------------------- diff --git a/mc/sfs.ini b/mc/sfs.ini index 522cca1..699078a 100644 --- a/mc/sfs.ini +++ b/mc/sfs.ini @@ -10,6 +10,10 @@ bz/1 bzip < %1 > %3 ubz/1 bzip -d < %1 > %3 bz2/1 bzip2 < %1 > %3 ubz2/1 bzip2 -d < %1 > %3 +lz/1 lzip < %1 > %3 +ulz/1 lzip -d < %1 > %3 +lz4/1 lz4 < %1 > %3 +ulz4/1 lz4 -d < %1 > %3 lzma/1 lzma < %1 > %3 ulzma/1 lzma -d < %1 > %3 xz/1 xz < %1 > %3