Page Menu
Home
Solus
Search
Configure Global Search
Log In
Files
F11018406
D13410.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
36 KB
Referenced Files
None
Subscribers
None
D13410.diff
View Options
diff --git a/files/nanorc b/files/nanorc
--- a/files/nanorc
+++ b/files/nanorc
@@ -1,333 +1,311 @@
## Sample initialization file for GNU nano.
##
-## Please note that you must have configured nano with --enable-nanorc
-## for this file to be read! Also note that this file should not be in
-## DOS or Mac format, and that characters specially interpreted by the
-## shell should not be escaped here.
+## For the options that take parameters, the default value is shown.
+## Other options are unset by default. To make sure that an option
+## is disabled, you can use "unset <option>".
##
-## To make sure a value is disabled, use "unset <option>".
-##
-## For the options that take parameters, the default value is given.
-## Other options are unset by default.
-##
-## Quotes inside string parameters don't have to be escaped with
-## backslashes. The last double quote in the string will be treated as
-## its end. For example, for the "brackets" option, ""')>]}" will match
-## ", ', ), >, ], and }.
+## Characters that are special in a shell should not be escaped here.
+## Inside string parameters, quotes should not be escaped -- the last
+## double quote on the line will be seen as the closing quote.
+
+## Make 'nextword' (Ctrl+Right) and 'chopwordright' (Ctrl+Delete)
+## stop at word ends instead of at beginnings.
+# set afterends
-## Use auto-indentation.
+## When soft line wrapping is enabled, make it wrap lines at blanks
+## (tabs and spaces) instead of always at the edge of the screen.
+# set atblanks
+
+## Automatically indent a newly created line to the same number of
+## tabs and/or spaces as the preceding line -- or as the next line
+## if the preceding line is the beginning of a paragraph.
# set autoindent
-## Backup files to filename~.
+## Back up files to the current filename plus a tilde.
# set backup
## The directory to put unique backup files in.
# set backupdir ""
-## Do backwards searches by default.
-# set backwards
-
## Use bold text instead of reverse video text.
# set boldtext
-## The characters treated as closing brackets when justifying
-## paragraphs. They cannot contain blank characters. Only closing
-## punctuation, optionally followed by closing brackets, can end
-## sentences.
-##
+## Treat any line with leading whitespace as the beginning of a paragraph.
+# set bookstyle
+
+## The characters treated as closing brackets when justifying paragraphs.
+## This may not include any blank characters. Only closing punctuation,
+## optionally followed by these closing brackets, can end sentences.
# set brackets ""')>]}"
-## Do case sensitive searches by default.
+## Automatically hard-wrap the current line when it becomes overlong.
+# set breaklonglines
+
+## Do case-sensitive searches by default.
# set casesensitive
-## Constantly display the cursor position in the statusbar. Note that
-## this overrides "quickblank".
+## Constantly display the cursor position in the status bar or minibar.
# set constantshow
-## Use cut to end of line by default.
+## Use cut-from-cursor-to-end-of-line by default.
# set cutfromcursor
-## Set the line length for wrapping text and justifying paragraphs.
-## If fill is 0 or less, the line length will be the screen width less
-## this number.
-##
+## Do not use the line below the title bar, leaving it entirely blank.
+# set emptyline
+
+## Set the target width for automatic hard-wrapping and for justifying
+## paragraphs. If the specified value is 0 or less, the wrapping point
+## will be the terminal's width minus this number.
# set fill -8
-## Enable ~/.nano_history for saving and reading search/replace strings.
+## Remember the used search/replace strings for the next session.
# set historylog
+## Display a "scrollbar" on the righthand side of the edit window.
+# set indicator
+
+## Scroll the buffer contents per half-screen instead of per line.
+# set jumpyscrolling
+
+## Display line numbers to the left (and any anchors in the margin).
+# set linenumbers
+
## Enable vim-style lock-files. This is just to let a vim user know you
-## are editing a file [s]he is trying to edit and vice versa. There are
-## no plans to implement vim-style undo state in these files
+## are editing a file [s]he is trying to edit and vice versa. There are
+## no plans to implement vim-style undo state in these files.
# set locking
-## The opening and closing brackets that can be found by bracket
-## searches. They cannot contain blank characters. The former set must
-## come before the latter set, and both must be in the same order.
-##
+## Fall back to slow libmagic to try and determine an applicable syntax.
+# set magic
+
+## The opening and closing brackets that are found by a matching-bracket
+## search. This may not contain blank characters. The opening brackets
+## must come before the closing ones, and they must be in the same order.
# set matchbrackets "(<[{)>]}"
+## Suppress the title bar and show the filename plus a cursor-position
+## percentage in the space of the status bar.
+# set minibar
+
## Enable mouse support, if available for your system. When enabled,
## mouse clicks can be used to place the cursor, set the mark (with a
-## double click), and execute shortcuts. The mouse will work in the X
-## Window System, and on the console when gpm is running.
-##
+## double click), and execute shortcuts. The mouse will work in the
+## X Window System, and on the console when gpm is running.
# set mouse
-## Allow multiple file buffers (inserting a file will put it into a
-## separate buffer). You must have configured with --enable-multibuffer
-## for this to work.
-##
+## Switch on multiple file buffers (inserting a file will put it into
+## a separate buffer).
# set multibuffer
## Don't convert files from DOS/Mac format.
# set noconvert
-## Don't follow symlinks when writing files.
-# set nofollow
-
## Don't display the helpful shortcut lists at the bottom of the screen.
# set nohelp
-## Don't add newlines to the ends of files.
+## Don't automatically add a newline when a file does not end with one.
set nonewlines
-## Don't wrap text at all.
-set nowrap
-
## Set operating directory. nano will not read or write files outside
## this directory and its subdirectories. Also, the current directory
## is changed to here, so any files are inserted from this dir. A blank
-## string means the operating directory feature is turned off.
-##
+## string means the operating-directory feature is turned off.
# set operatingdir ""
+## Remember the cursor position in each file for the next editing session.
+# set positionlog
+
## Preserve the XON and XOFF keys (^Q and ^S).
# set preserve
-## The characters treated as closing punctuation when justifying
-## paragraphs. They cannot contain blank characters. Only closing
-## punctuation, optionally followed by closing brackets, can end
-## sentences.
-##
+## The characters treated as closing punctuation when justifying paragraphs.
+## This may not contain blank characters. Only these closing punctuations,
+## optionally followed by closing brackets, can end sentences.
# set punct "!.?"
-## Do quick statusbar blanking. Statusbar messages will disappear after
-## 1 keystroke instead of 26. Note that "const" overrides this.
-##
+## Make status-bar messages disappear after 1 keystroke instead of after 20.
# set quickblank
-## The email-quote string, used to justify email-quoted paragraphs.
-## This is an extended regular expression if your system supports them,
-## otherwise a literal string. Default:
-# set quotestr "^([ ]*[#:>\|}])+"
-## if you have extended regular expression support, otherwise:
-# set quotestr "> "
+## The regular expression that matches quoting characters in email
+## or line-comment introducers in source code. The default is:
+# set quotestr "^([ ]*([!#%:;>|}]|//))+"
+
+## Try to work around a mismatching terminfo terminal description.
+# set rawsequences
## Fix Backspace/Delete confusion problem.
# set rebinddelete
-## Fix numeric keypad key confusion problem.
-# set rebindkeypad
-
-## Do extended regular expression searches by default.
+## Do regular-expression searches by default.
+## Regular expressions are of the extended type (ERE).
# set regexp
-## Make the Home key smarter. When Home is pressed anywhere but at the
+## Save a changed buffer automatically on exit; don't prompt.
+# set saveonexit
+## (The old form of this option, 'set tempfile', is deprecated.)
+
+## Put the cursor on the highlighted item in the file browser, and
+## show the cursor in the help viewer; useful for people who use a
+## braille display and people with poor vision.
+# set showcursor
+
+## Make the Home key smarter: when Home is pressed anywhere but at the
## very beginning of non-whitespace characters on a line, the cursor
## will jump to that beginning (either forwards or backwards). If the
-## cursor is already at that position, it will jump to the true
-## beginning of the line.
+## cursor is already at that position, it will jump to the true start
+## of the line (the left edge).
# set smarthome
-## Enable soft line wrapping (AKA full line display).
+## Spread overlong lines over multiple screen lines.
# set softwrap
## Use this spelling checker instead of the internal one. This option
-## does not properly have a default value.
-##
+## does not have a default value.
# set speller "aspell -x -c"
-## Allow nano to be suspended.
-# set suspend
+## Use the end of the title bar for some state flags: I = auto-indenting,
+## M = mark, L = hard-wrapping long lines, R = recording, S = soft-wrapping.
+# set stateflags
+
+## Allow nano to be suspended (with ^Z by default).
+# set suspendable
+## (The old form of this option, 'set suspend', is deprecated.)
## Use this tab size instead of the default; it must be greater than 0.
set tabsize 4
-## Convert typed tabs to spaces.
+## Convert each typed tab to the fitting number of spaces.
set tabstospaces
-## Save automatically on exit, don't prompt.
-# set tempfile
-
-## Enable the new (EXPERIMENTAL) generic undo code, not just for line
-## cuts.
-# set undo
-
-## Disallow file modification. Why would you want this in an rcfile? ;)
-# set view
+## Snip whitespace at the end of lines when justifying or hard-wrapping.
+# set trimblanks
## The two single-column characters used to display the first characters
## of tabs and spaces. 187 in ISO 8859-1 (0000BB in Unicode) and 183 in
## ISO-8859-1 (0000B7 in Unicode) seem to be good values for these.
-# set whitespace " "
+## The default when in a UTF-8 locale:
+# set whitespace "»·"
+## The default otherwise:
+# set whitespace ">."
-## Detect word boundaries more accurately by treating punctuation
+## Detect word boundaries differently by treating punctuation
## characters as parts of words.
# set wordbounds
-
-## Color setup
-##
-## Format:
-##
-## syntax "short description" ["filename regex" ...]
-##
-## The "none" syntax is reserved; specifying it on the command line is
-## the same as not having a syntax at all. The "default" syntax is
-## special: it takes no filename regexes, and applies to files that
-## don't match any other syntax's filename regexes.
-##
-## color foreground,background "regex" ["regex"...]
-## or
-## icolor foreground,background "regex" ["regex"...]
-##
-## "color" will do case sensitive matches, while "icolor" will do case
-## insensitive matches.
-##
-## Valid colors: white, black, red, blue, green, yellow, magenta, cyan.
-## For foreground colors, you may use the prefix "bright" to get a
-## stronger highlight.
-##
-## To use multi-line regexes, use the start="regex" end="regex"
-## [start="regex" end="regex"...] format.
-##
-## If your system supports transparency, not specifying a background
-## color will use a transparent color. If you don't want this, be sure
-## to set the background color to black or white.
-##
-## If you wish, you may put your syntaxes in separate files. You can
-## make use of such files (which can only include "syntax", "color", and
-## "icolor" commands) as follows:
-##
-## include "/path/to/syntax_file.nanorc"
-##
-## Unless otherwise noted, the name of the syntax file (without the
-## ".nanorc" extension) should be the same as the "short description"
-## name inside that file. These names are kept fairly short to make
-## them easier to remember and faster to type using nano's -Y option.
-##
-## All regexes should be extended regular expressions.
-
-## Key bindings
-## Please see nanorc(5) for more details on this
-##
-## Here are some samples to get you going
-##
-# bind M-W nowrap main
-# bind M-A casesens search
-# bind ^S research main
-
-## Set this if your backspace key sends delete most of the time (2.1.3+)
-# bind kdel backspace all
-
-
-## Nanorc files
-# include "/usr/share/nano/nanorc.nanorc"
-
-## C/C++
-include "/usr/share/nano/c.nanorc"
-
-## Makefiles
-include "/usr/share/nano/makefile.nanorc"
-
-## Cascading Style Sheets
-# include "/usr/share/nano/css.nanorc"
-
-## Debian files
-# include "/usr/share/nano/debian.nanorc"
-
-## Gentoo files
-# include "/usr/share/nano/gentoo.nanorc"
-
-## HTML
+## The characters (besides alphanumeric ones) that should be considered
+## as parts of words. This option does not have a default value. When
+## set, it overrides option 'set wordbounds'.
+# set wordchars "<_>."
+
+## Let an unmodified Backspace or Delete erase the marked region (instead
+## of a single character, and without affecting the cutbuffer).
+# set zap
+
+
+## Paint the interface elements of nano. These are examples; there are
+## no colors by default, except for errorcolor and spotlightcolor.
+# set titlecolor bold,white,blue
+# set promptcolor lightwhite,grey
+# set statuscolor bold,white,green
+# set errorcolor bold,white,red
+# set spotlightcolor black,lightyellow
+# set selectedcolor lightwhite,magenta
+# set stripecolor ,yellow
+# set scrollercolor cyan
+# set numbercolor cyan
+# set keycolor cyan
+# set functioncolor green
+
+## In root's .nanorc you might want to use:
+# set titlecolor bold,white,magenta
+# set promptcolor black,yellow
+# set statuscolor bold,white,magenta
+# set errorcolor bold,white,red
+# set spotlightcolor black,orange
+# set selectedcolor lightwhite,cyan
+# set stripecolor ,yellow
+# set scrollercolor magenta
+# set numbercolor magenta
+# set keycolor lightmagenta
+# set functioncolor magenta
+
+
+## === Syntax coloring ===
+## For all details, see 'man nanorc', section SYNTAX HIGHLIGHTING.
+
+## To include most of the existing syntax definitions, you can do:
+# include "/usr/share/nano/*.nanorc"
+
+## Or you can select just the ones you need. For example:
# include "/usr/share/nano/html.nanorc"
-
-## PHP
-include "/usr/share/nano/php.nanorc"
-
-## TCL
-# include "/usr/share/nano/tcl.nanorc"
-
-## TeX
-# include "/usr/share/nano/tex.nanorc"
-
-## Quoted emails (under e.g. mutt)
-# include "/usr/share/nano/mutt.nanorc"
-
-## Patch files
-include "/usr/share/nano/patch.nanorc"
-
-## Manpages
-# include "/usr/share/nano/man.nanorc"
-
-## Groff
-# include "/usr/share/nano/groff.nanorc"
-
-## Perl
-include "/usr/share/nano/perl.nanorc"
-
-## Python
-include "/usr/share/nano/python.nanorc"
-
-## Ruby
-# include "/usr/share/nano/ruby.nanorc"
-
-## Java
-# include "/usr/share/nano/java.nanorc"
-
-## Fortran
-# include "/usr/share/nano/fortran.nanorc"
-
-## Objective-C
-# include "/usr/share/nano/objc.nanorc"
-
-## OCaml
-# include "/usr/share/nano/ocaml.nanorc"
-
-## AWK
-# include "/usr/share/nano/awk.nanorc"
-
-## Assembler
-# include "/usr/share/nano/asm.nanorc"
-
-## Bourne shell scripts
-include "/usr/share/nano/sh.nanorc"
-
-## POV-Ray
-# include "/usr/share/nano/pov.nanorc"
-
-## XML-type files
-include "/usr/share/nano/xml.nanorc"
-
-# Git commit messages
-include "/usr/share/nano/git.nanorc"
-
-#######################################
-# https://github.com/scopatz/nanorc/ #
-#######################################
-
-# Apache config files
-include "/usr/share/nano/apacheconf.nanorc"
-
-# Dockerfile syntax
-include "/usr/share/nano/Dockerfile.nanorc"
-
-# INI format files (.desktop, etc.)
-include "/usr/share/nano/ini.nanorc"
-
-# nginx configuration format
-include "/usr/share/nano/nginx.nanorc"
-
-# yaml files
-include "/usr/share/nano/yaml.nanorc"
+# include "/usr/share/nano/python.nanorc"
+# include "/usr/share/nano/sh.nanorc"
+
+## In /usr/share/nano/extra/ you can find some syntaxes that are
+## specific for certain distros or for some less common languages.
+
+
+## If <Tab> should always produce four spaces when editing a Python file,
+## independent of the settings of 'tabsize' and 'tabstospaces':
+# extendsyntax python tabgives " "
+
+## If <Tab> should always produce an actual TAB when editing a Makefile:
+# extendsyntax makefile tabgives " "
+
+
+## === Key bindings ===
+## For all details, see 'man nanorc', section REBINDING KEYS.
+
+## The <Ctrl+Delete> keystroke deletes the word to the right of the cursor.
+## On some terminals the <Ctrl+Backspace> keystroke produces ^H, which is
+## the ASCII character for backspace, so it is bound by default to the
+## backspace function. The <Backspace> key itself produces a different
+## keycode, which is hard-bound to the backspace function. So, if you
+## normally use <Backspace> for backspacing and not ^H, you can make
+## <Ctrl+Backspace> delete the word to the left of the cursor with:
+# bind ^H chopwordleft main
+
+## For quickly uppercasing or lowercasing the word under the cursor.
+## (These effectively do a Ctrl+Right followed by a Shift+Ctrl+Left,
+## and then pipe the selected text through a sed command.)
+#bind Sh-M-U "Oc[1;6D|sed 's/.*/\U&/'^M" main
+#bind Sh-M-L "Oc[1;6D|sed 's/.*/\L&/'^M" main
+
+## If you would like nano to have keybindings that are more "usual",
+## such as ^O for Open, ^F for Find, ^H for Help, and ^Q for Quit,
+## then uncomment these:
+#bind ^Q exit all
+#bind ^S savefile main
+#bind ^W writeout main
+#bind ^O insert main
+#bind ^H help all
+#bind ^H exit help
+#bind ^F whereis all
+#bind ^G findnext all
+#bind ^B wherewas all
+#bind ^D findprevious all
+#bind ^R replace main
+#bind ^X cut main
+#bind ^C copy main
+#bind ^V paste all
+#bind ^P location main
+#bind ^E execute main
+#bind ^A mark main
+#unbind ^K main
+#unbind ^U all
+#unbind ^N main
+#unbind ^Y all
+#unbind M-J main
+#unbind M-T main
+#bind ^T gotoline main
+#bind ^T gotodir browser
+#bind ^T cutrestoffile execute
+#bind ^L linter execute
+#bind M-U undo main
+#bind M-R redo main
+#bind ^Z undo main
+#bind ^Y redo main
+#set multibuffer
+
+
+## Include syntax definitions:
diff --git a/files/nanorc-extras/Dockerfile.nanorc b/files/nanorc-extras/Dockerfile.nanorc
deleted file mode 100644
--- a/files/nanorc-extras/Dockerfile.nanorc
+++ /dev/null
@@ -1,26 +0,0 @@
-## Syntax highlighting for Dockerfiles
-syntax "Dockerfile" "Dockerfile[^/]*$" "\.dockerfile$"
-
-## Keywords
-icolor red "^(FROM|RUN|CMD|LABEL|MAINTAINER|EXPOSE|ENV|ADD|COPY|ENTRYPOINT|VOLUME|USER|WORKDIR|ARG|ONBUILD|STOPSIGNAL|HEALTHCHECK|SHELL)[[:space:]]"
-
-## Brackets & parenthesis
-color brightgreen "(\(|\)|\[|\])"
-
-## Double ampersand
-color brightmagenta "&&"
-
-## Comments
-icolor cyan "^[[:space:]]*#.*$"
-
-## Blank space at EOL
-color ,green "[[:space:]]+$"
-
-## Strings, single-quoted
-color brightwhite "'([^']|(\\'))*'" "%[qw]\{[^}]*\}" "%[qw]\([^)]*\)" "%[qw]<[^>]*>" "%[qw]\[[^]]*\]" "%[qw]\$[^$]*\$" "%[qw]\^[^^]*\^" "%[qw]![^!]*!"
-
-## Strings, double-quoted
-color brightwhite ""([^"]|(\\"))*"" "%[QW]?\{[^}]*\}" "%[QW]?\([^)]*\)" "%[QW]?<[^>]*>" "%[QW]?\[[^]]*\]" "%[QW]?\$[^$]*\$" "%[QW]?\^[^^]*\^" "%[QW]?![^!]*!"
-
-## Single and double quotes
-color brightyellow "('|\")"
diff --git a/files/nanorc-extras/apacheconf.nanorc b/files/nanorc-extras/apacheconf.nanorc
deleted file mode 100644
--- a/files/nanorc-extras/apacheconf.nanorc
+++ /dev/null
@@ -1,47 +0,0 @@
-# Apache files
-syntax "Apacheconf" "httpd\.conf|mime\.types|vhosts\.d\\*|\.htaccess"
-color yellow ".+"
-color brightcyan "(AcceptMutex|AcceptPathInfo|AccessFileName|Action|AddAlt|AddAltByEncoding|AddAltByType|AddCharset|AddDefaultCharset|AddDescription|AddEncoding)"
-color brightcyan "(AddHandler|AddIcon|AddIconByEncoding|AddIconByType|AddInputFilter|AddLanguage|AddModuleInfo|AddOutputFilter|AddOutputFilterByType|AddType|Alias|AliasMatch)"
-color brightcyan "(Allow|AllowCONNECT|AllowEncodedSlashes|AllowOverride|Anonymous|Anonymous_Authoritative|Anonymous_LogEmail|Anonymous_MustGiveEmail|Anonymous_NoUserID)"
-color brightcyan "(Anonymous_VerifyEmail|AssignUserID|AuthAuthoritative|AuthDBMAuthoritative|AuthDBMGroupFile|AuthDBMType|AuthDBMUserFile|AuthDigestAlgorithm)"
-color brightcyan "(AuthDigestDomain|AuthDigestFile|AuthDigestGroupFile|AuthDigestNcCheck|AuthDigestNonceFormat|AuthDigestNonceLifetime|AuthDigestQop|AuthDigestShmemSize)"
-color brightcyan "(AuthGroupFile|AuthLDAPAuthoritative|AuthLDAPBindDN|AuthLDAPBindPassword|AuthLDAPCharsetConfig|AuthLDAPCompareDNOnServer|AuthLDAPDereferenceAliases)"
-color brightcyan "(AuthLDAPEnabled|AuthLDAPFrontPageHack|AuthLDAPGroupAttribute|AuthLDAPGroupAttributeIsDN|AuthLDAPRemoteUserIsDN|AuthLDAPUrl|AuthName|AuthType|AuthUserFile)"
-color brightcyan "(BrowserMatch|BrowserMatchNoCase|BS2000Account|BufferedLogs|CacheDefaultExpire|CacheDirLength|CacheDirLevels|CacheDisable|CacheEnable|CacheExpiryCheck)"
-color brightcyan "(CacheFile|CacheForceCompletion|CacheGcClean|CacheGcDaily|CacheGcInterval|CacheGcMemUsage|CacheGcUnused|CacheIgnoreCacheControl|CacheIgnoreHeaders)"
-color brightcyan "(CacheIgnoreNoLastMod|CacheLastModifiedFactor|CacheMaxExpire|CacheMaxFileSize|CacheMinFileSize|CacheNegotiatedDocs|CacheRoot|CacheSize|CacheTimeMargin)"
-color brightcyan "(CGIMapExtension|CharsetDefault|CharsetOptions|CharsetSourceEnc|CheckSpelling|ChildPerUserID|ContentDigest|CookieDomain|CookieExpires|CookieLog|CookieName)"
-color brightcyan "(CookieStyle|CookieTracking|CoreDumpDirectory|CustomLog|Dav|DavDepthInfinity|DavLockDB|DavMinTimeout|DefaultIcon|DefaultLanguage|DefaultType)"
-color brightcyan "(DeflateBufferSize|DeflateCompressionLevel|DeflateFilterNote|DeflateMemLevel|DeflateWindowSize|Deny|Directory|DirectoryIndex|DirectoryMatch|DirectorySlash)"
-color brightcyan "(DocumentRoot|DumpIOInput|DumpIOOutput|EnableExceptionHook|EnableMMAP|EnableSendfile|ErrorDocument|ErrorLog|Example|ExpiresActive|ExpiresByType)"
-color brightcyan "(ExpiresDefault|ExtendedStatus|ExtFilterDefine|ExtFilterOptions|FileETag|Files|FilesMatch|ForceLanguagePriority|ForceType|ForensicLog|Group|Header)"
-color brightcyan "(HeaderName|HostnameLookups|IdentityCheck|IfDefine|IfModule|IfVersion|ImapBase|ImapDefault|ImapMenu|Include|IndexIgnore|IndexOptions|IndexOrderDefault)"
-color brightcyan "(ISAPIAppendLogToErrors|ISAPIAppendLogToQuery|ISAPICacheFile|ISAPIFakeAsync|ISAPILogNotSupported|ISAPIReadAheadBuffer|KeepAlive|KeepAliveTimeout)"
-color brightcyan "(LanguagePriority|LDAPCacheEntries|LDAPCacheTTL|LDAPConnectionTimeout|LDAPOpCacheEntries|LDAPOpCacheTTL|LDAPSharedCacheFile|LDAPSharedCacheSize)"
-color brightcyan "(LDAPTrustedCA|LDAPTrustedCAType|Limit|LimitExcept|LimitInternalRecursion|LimitRequestBody|LimitRequestFields|LimitRequestFieldSize|LimitRequestLine)"
-color brightcyan "(LimitXMLRequestBody|Listen|ListenBackLog|LoadFile|LoadModule|Location|LocationMatch|LockFile|LogFormat|LogLevel|MaxClients|MaxKeepAliveRequests)"
-color brightcyan "(MaxMemFree|MaxRequestsPerChild|MaxRequestsPerThread|MaxSpareServers|MaxSpareThreads|MaxThreads|MaxThreadsPerChild|MCacheMaxObjectCount|MCacheMaxObjectSize)"
-color brightcyan "(MCacheMaxStreamingBuffer|MCacheMinObjectSize|MCacheRemovalAlgorithm|MCacheSize|MetaDir|MetaFiles|MetaSuffix|MimeMagicFile|MinSpareServers|MinSpareThreads)"
-color brightcyan "(MMapFile|ModMimeUsePathInfo|MultiviewsMatch|NameVirtualHost|NoProxy|NumServers|NWSSLTrustedCerts|NWSSLUpgradeable|Options|Order|PassEnv|PidFile)"
-color brightcyan "(ProtocolEcho|Proxy|ProxyBadHeader|ProxyBlock|ProxyDomain|ProxyErrorOverride|ProxyIOBufferSize|ProxyMatch|ProxyMaxForwards|ProxyPass|ProxyPassReverse)"
-color brightcyan "(ProxyPreserveHost|ProxyReceiveBufferSize|ProxyRemote|ProxyRemoteMatch|ProxyRequests|ProxyTimeout|ProxyVia|ReadmeName|Redirect|RedirectMatch)"
-color brightcyan "(RedirectPermanent|RedirectTemp|RemoveCharset|RemoveEncoding|RemoveHandler|RemoveInputFilter|RemoveLanguage|RemoveOutputFilter|RemoveType|RequestHeader)"
-color brightcyan "(Require|RewriteBase|RewriteCond|RewriteEngine|RewriteLock|RewriteLog|RewriteLogLevel|RewriteMap|RewriteOptions|RewriteRule|RLimitCPU|RLimitMEM|RLimitNPROC)"
-color brightcyan "(Satisfy|ScoreBoardFile|Script|ScriptAlias|ScriptAliasMatch|ScriptInterpreterSource|ScriptLog|ScriptLogBuffer|ScriptLogLength|ScriptSock|SecureListen)"
-color brightcyan "(SendBufferSize|ServerAdmin|ServerAlias|ServerLimit|ServerName|ServerPath|ServerRoot|ServerSignature|ServerTokens|SetEnv|SetEnvIf|SetEnvIfNoCase|SetHandler)"
-color brightcyan "(SetInputFilter|SetOutputFilter|SSIEndTag|SSIErrorMsg|SSIStartTag|SSITimeFormat|SSIUndefinedEcho|SSLCACertificateFile|SSLCACertificatePath)"
-color brightcyan "(SSLCARevocationFile|SSLCARevocationPath|SSLCertificateChainFile|SSLCertificateFile|SSLCertificateKeyFile|SSLCipherSuite|SSLEngine|SSLMutex|SSLOptions)"
-color brightcyan "(SSLPassPhraseDialog|SSLProtocol|SSLProxyCACertificateFile|SSLProxyCACertificatePath|SSLProxyCARevocationFile|SSLProxyCARevocationPath|SSLProxyCipherSuite)"
-color brightcyan "(SSLProxyEngine|SSLProxyMachineCertificateFile|SSLProxyMachineCertificatePath|SSLProxyProtocol|SSLProxyVerify|SSLProxyVerifyDepth|SSLRandomSeed|SSLRequire)"
-color brightcyan "(SSLRequireSSL|SSLSessionCache|SSLSessionCacheTimeout|SSLUserName|SSLVerifyClient|SSLVerifyDepth|StartServers|StartThreads|SuexecUserGroup|ThreadLimit)"
-color brightcyan "(ThreadsPerChild|ThreadStackSize|TimeOut|TraceEnable|TransferLog|TypesConfig|UnsetEnv|UseCanonicalName|User|UserDir|VirtualDocumentRoot)"
-color brightcyan "(VirtualDocumentRootIP|VirtualHost|VirtualScriptAlias|VirtualScriptAliasIP|Win32DisableAcceptEx|XBitHack)"
-color yellow "<[^>]+>"
-color brightcyan "</?[A-Za-z]+"
-color brightcyan "(<|</|>)"
-color green "\"(\\.|[^\"])*\""
-color white "#.*"
-
-## Trailing spaces
-color ,green "[[:space:]]+$"
diff --git a/files/nanorc-extras/git.nanorc b/files/nanorc-extras/git.nanorc
deleted file mode 100644
--- a/files/nanorc-extras/git.nanorc
+++ /dev/null
@@ -1,17 +0,0 @@
-# Original source:
-# https://gist.github.com/keithamus/736220
-
-syntax "gitcommit" "COMMIT_EDITMSG$"
-color white "#.*"
-color green "#.(modified|deleted).*"
-color yellow start="# Changes.*" end="# Changed.*"
-color cyan start="# Untracked.*" end="diff"
-color cyan start="# Untracked.*" end="$$"
-color brightred "^deleted file mode .*"
-color brightgreen "^\+.*"
-color brightred "^-.*"
-color brightyellow "^(diff|index|---|\+\+\+).*"
-color brightmagenta "@@.*@@"
-color white "# (Change[ds]|Untracked) .*"
-color white "#.*\(use .*"
-color white "^#"
diff --git a/files/nanorc-extras/ini.nanorc b/files/nanorc-extras/ini.nanorc
deleted file mode 100644
--- a/files/nanorc-extras/ini.nanorc
+++ /dev/null
@@ -1,11 +0,0 @@
-syntax "INI" "\.(ini|desktop|lfl|override|cfg)$" "(mimeapps\.list|pinforc|setup\.cfg)$" "weechat/.+\.conf$"
-header "^\[[A-Za-z]+\]$"
-
-color brightcyan "\<(true|false)\>"
-color cyan "^[[:space:]]*[^=]*="
-color brightmagenta "^[[:space:]]*\[.*\]$"
-color red "[=;]"
-color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color brightblue "(^|[[:space:]])(#([^{].*)?|;.*)$"
-color ,green "[[:space:]]+$"
-color ,red " + +| + +"
diff --git a/files/nanorc-extras/nginx.nanorc b/files/nanorc-extras/nginx.nanorc
deleted file mode 100644
--- a/files/nanorc-extras/nginx.nanorc
+++ /dev/null
@@ -1,13 +0,0 @@
-syntax "Nginx" "nginx.*\.conf$" "\.nginx$" ".*\/sites\-available\/.*$" ".*\/sites\-enabled\/.*$"
-header "^(server|upstream)[^{]*\{$"
-
-color brightmagenta "\<(events|server|http|location|upstream)[[:space:]]*\{"
-color cyan "(^|[[:space:]{;])(access_log|add_after_body|add_before_body|add_header|addition_types|aio|alias|allow|ancient_browser|ancient_browser_value|auth_basic|auth_basic_user_file|autoindex|autoindex_exact_size|autoindex_localtime|break|charset|charset_map|charset_types|chunked_transfer_encoding|client_body_buffer_size|client_body_in_file_only|client_body_in_single_buffer|client_body_temp_path|client_body_timeout|client_header_buffer_size|client_header_timeout|client_max_body_size|connection_pool_size|create_full_put_path|daemon|dav_access|dav_methods|default_type|deny|directio|directio_alignment|disable_symlinks|empty_gif|env|error_log|error_page|expires|fastcgi_buffer_size|fastcgi_buffers|fastcgi_busy_buffers_size|fastcgi_cache|fastcgi_cache_bypass|fastcgi_cache_key|fastcgi_cache_lock|fastcgi_cache_lock_timeout|fastcgi_cache_min_uses|fastcgi_cache_path|fastcgi_cache_use_stale|fastcgi_cache_valid|fastcgi_connect_timeout|fastcgi_hide_header|fastcgi_ignore_client_abort|fastcgi_ignore_headers|fastcgi_index|fastcgi_intercept_errors|fastcgi_keep_conn|fastcgi_max_temp_file_size|fastcgi_next_upstream|fastcgi_no_cache|fastcgi_param|fastcgi_pass|fastcgi_pass_header|fastcgi_read_timeout|fastcgi_send_timeout|fastcgi_split_path_info|fastcgi_store|fastcgi_store_access|fastcgi_temp_file_write_size|fastcgi_temp_path|flv|geo|geoip_city|geoip_country|gzip|gzip_buffers|gzip_comp_level|gzip_disable|gzip_http_version|gzip_min_length|gzip_proxied|gzip_static|gzip_types|gzip_vary|if|if_modified_since|ignore_invalid_headers|image_filter|image_filter_buffer|image_filter_jpeg_quality|image_filter_sharpen|image_filter_transparency|include|index|internal|ip_hash|keepalive|keepalive_disable|keepalive_requests|keepalive_timeout|large_client_header_buffers|limit_conn|limit_conn_log_level|limit_conn_zone|limit_except|limit_rate|limit_rate_after|limit_req|limit_req_log_level|limit_req_zone|limit_zone|lingering_close|lingering_time|lingering_timeout|listen|location|log_format|log_not_found|log_subrequest|map|map_hash_bucket_size|map_hash_max_size|master_process|max_ranges|memcached_buffer_size|memcached_connect_timeout|memcached_next_upstream|memcached_pass|memcached_read_timeout|memcached_send_timeout|merge_slashes|min_delete_depth|modern_browser|modern_browser_value|mp4|mp4_buffer_size|mp4_max_buffer_size|msie_padding|msie_refresh|open_file_cache|open_file_cache_errors|open_file_cache_min_uses|open_file_cache_valid|open_log_file_cache|optimize_server_names|override_charset|pcre_jit|perl|perl_modules|perl_require|perl_set|pid|port_in_redirect|postpone_output|proxy_buffer_size|proxy_buffering|proxy_buffers|proxy_busy_buffers_size|proxy_cache|proxy_cache_bypass|proxy_cache_key|proxy_cache_lock|proxy_cache_lock_timeout|proxy_cache_min_uses|proxy_cache_path|proxy_cache_use_stale|proxy_cache_valid|proxy_connect_timeout|proxy_cookie_domain|proxy_cookie_path|proxy_hide_header|proxy_http_version|proxy_ignore_client_abort|proxy_ignore_headers|proxy_intercept_errors|proxy_max_temp_file_size|proxy_next_upstream|proxy_no_cache|proxy_pass|proxy_pass_header|proxy_read_timeout|proxy_redirect|proxy_send_timeout|proxy_set_header|proxy_ssl_session_reuse|proxy_store|proxy_store_access|proxy_temp_file_write_size|proxy_temp_path|proxy_cache_methods|proxy_pass_request_body|proxy_pass_request_headers|proxy_cache_convert_head|proxy_cache_lock_age|proxy_cache_max_range_offset|proxy_send_lowat|proxy_set_body|proxy_socket_keepalive|proxy_ssl_trusted_certificate|random_index|read_ahead|real_ip_header|recursive_error_pages|request_pool_size|reset_timedout_connection|resolver|resolver_timeout|return|rewrite|root|satisfy|satisfy_any|secure_link_secret|send_lowat|send_timeout|sendfile|sendfile_max_chunk|server|server|server_name|server_name_in_redirect|server_names_hash_bucket_size|server_names_hash_max_size|server_tokens|set|set_real_ip_from|source_charset|split_clients|ssi|ssi_silent_errors|ssi_types|ssl|ssl_certificate|ssl_certificate_key|ssl_ciphers|ssl_client_certificate|ssl_crl|ssl_dhparam|ssl_engine|ssl_prefer_server_ciphers|ssl_protocols|ssl_session_cache|ssl_session_timeout|ssl_verify_client|ssl_verify_depth|ssl_ecdh_curve|ssl_session_tickets|ssl_stapling|ssl_stapling_verify|ssl_stapling_file|ssl_stapling_responder|ssl_buffer_size|ssl_early_data|ssl_password_file|ssl_session_ticket_key|ssl_trusted_certificate|sub_filter|sub_filter_once|sub_filter_types|tcp_nodelay|tcp_nopush|timer_resolution|try_files|types|types_hash_bucket_size|types_hash_max_size|underscores_in_headers|uninitialized_variable_warn|upstream|user|userid|userid_domain|userid_expires|userid_name|userid_p3p|userid_path|userid_service|valid_referers|variables_hash_bucket_size|variables_hash_max_size|worker_priority|worker_processes|worker_rlimit_core|worker_rlimit_nofile|working_directory|xml_entities|xslt_stylesheet|xslt_types)([[:space:]]|$)"
-color brightcyan "\<(on|off)\>"
-color brightyellow "\$[A-Za-z][A-Za-z0-9_]*"
-color red "[*]"
-color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color yellow start="'$" end="';$"
-color brightblue "(^|[[:space:]])#([^{].*)?$"
-color ,green "[[:space:]]+$"
-color ,red " + +| + +"
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
name : nano
version : '6.3'
-release : 142
+release : 143
source :
- https://www.nano-editor.org/dist/v6/nano-6.3.tar.xz : eb532da4985672730b500f685dbaab885a466d08fbbf7415832b95805e6f8687
homepage : https://www.nano-editor.org
@@ -10,6 +10,8 @@
description: |
GNU nano is an easy-to-use text editor originally designed as a replacement for Pico, the ncurses-based editor from the non-free mailer package Pine (itself now available under the Apache License as Alpine).
mancompress: yes
+builddeps :
+ - nanorc
setup : |
%patch -p1 < $pkgfiles/0001-Use-a-stateless-configuration.patch
%reconfigure --enable-utf8 --docdir=/usr/share/doc/nano
@@ -17,8 +19,15 @@
%make
install : |
%make_install
- install -Dm00644 $pkgfiles/nanorc $installdir/usr/share/defaults/nano/nanorc
- # https://github.com/scopatz/nanorc
- for rcFile in $pkgfiles/nanorc-extras/*.nanorc; do
- install -m 00644 $rcFile $installdir/usr/share/nano
+ # Include syntax definitions
+ for rcfile in $installdir/usr/share/nano/*.nanorc; do
+ echo include /usr/share/nano/${rcfile##*nano/} >> $pkgfiles/nanorc
+ done
+ # Include missing definitions from scopatz's files
+ for rcfile in /usr/share/nanorc/*.nanorc; do
+ if ! grep -Fq ${rcfile#*highlighting/} $pkgfiles/nanorc
+ then
+ echo include "$rcfile" >> $pkgfiles/nanorc
+ fi
done
+ install -Dm00644 $pkgfiles/nanorc $installdir/usr/share/defaults/nano/nanorc
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -3,8 +3,8 @@
<Name>nano</Name>
<Homepage>https://www.nano-editor.org</Homepage>
<Packager>
- <Name>Joey Riches</Name>
- <Email>josephriches@gmail.com</Email>
+ <Name>Thomas Staudinger</Name>
+ <Email>Staudi.Kaos@gmail.com</Email>
</Packager>
<License>GPL-3.0-or-later</License>
<PartOf>system.devel</PartOf>
@@ -66,8 +66,6 @@
<Path fileType="man">/usr/share/man/man1/nano.1.gz</Path>
<Path fileType="man">/usr/share/man/man1/rnano.1.gz</Path>
<Path fileType="man">/usr/share/man/man5/nanorc.5.gz</Path>
- <Path fileType="data">/usr/share/nano/Dockerfile.nanorc</Path>
- <Path fileType="data">/usr/share/nano/apacheconf.nanorc</Path>
<Path fileType="data">/usr/share/nano/asm.nanorc</Path>
<Path fileType="data">/usr/share/nano/autoconf.nanorc</Path>
<Path fileType="data">/usr/share/nano/awk.nanorc</Path>
@@ -83,12 +81,10 @@
<Path fileType="data">/usr/share/nano/extra/haskell.nanorc</Path>
<Path fileType="data">/usr/share/nano/extra/povray.nanorc</Path>
<Path fileType="data">/usr/share/nano/extra/spec.nanorc</Path>
- <Path fileType="data">/usr/share/nano/git.nanorc</Path>
<Path fileType="data">/usr/share/nano/go.nanorc</Path>
<Path fileType="data">/usr/share/nano/groff.nanorc</Path>
<Path fileType="data">/usr/share/nano/guile.nanorc</Path>
<Path fileType="data">/usr/share/nano/html.nanorc</Path>
- <Path fileType="data">/usr/share/nano/ini.nanorc</Path>
<Path fileType="data">/usr/share/nano/java.nanorc</Path>
<Path fileType="data">/usr/share/nano/javascript.nanorc</Path>
<Path fileType="data">/usr/share/nano/json.nanorc</Path>
@@ -99,7 +95,6 @@
<Path fileType="data">/usr/share/nano/nanohelp.nanorc</Path>
<Path fileType="data">/usr/share/nano/nanorc.nanorc</Path>
<Path fileType="data">/usr/share/nano/nftables.nanorc</Path>
- <Path fileType="data">/usr/share/nano/nginx.nanorc</Path>
<Path fileType="data">/usr/share/nano/objc.nanorc</Path>
<Path fileType="data">/usr/share/nano/ocaml.nanorc</Path>
<Path fileType="data">/usr/share/nano/patch.nanorc</Path>
@@ -119,12 +114,12 @@
</Files>
</Package>
<History>
- <Update release="142">
- <Date>2022-07-07</Date>
+ <Update release="143">
+ <Date>2022-07-31</Date>
<Version>6.3</Version>
<Comment>Packaging update</Comment>
- <Name>Joey Riches</Name>
- <Email>josephriches@gmail.com</Email>
+ <Name>Thomas Staudinger</Name>
+ <Email>Staudi.Kaos@gmail.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Aug 7, 11:53 AM (1 d, 11 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5801761
Default Alt Text
D13410.diff (36 KB)
Attached To
Mode
D13410: Freshen up nanorc
Attached
Detach File
Event Timeline
Log In to Comment