Hello community, here is the log from the commit of package grc for openSUSE:Factory checked in at 2020-02-25 16:05:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grc (Old) and /work/SRC/openSUSE:Factory/.grc.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grc" Tue Feb 25 16:05:54 2020 rev:5 rq:778908 version:1.11.3 Changes: -------- --- /work/SRC/openSUSE:Factory/grc/grc.changes 2017-08-14 12:41:00.567664332 +0200 +++ /work/SRC/openSUSE:Factory/.grc.new.26092/grc.changes 2020-02-25 16:06:22.080510785 +0100 @@ -1,0 +2,13 @@ +Tue Feb 25 01:04:16 UTC 2020 - Simon Lees <[email protected]> + +- Update to v1.11.3 + * Some new configs + * iwconfig + * lolcat + * ntpupdate + * whois + * Minor changes to some other configs + * --color=auto is now default + * Do not colorize if output is not a terminal + +------------------------------------------------------------------- Old: ---- v1.11.1.tar.gz New: ---- v1.11.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grc.spec ++++++ --- /var/tmp/diff_new_pack.JfMUVk/_old 2020-02-25 16:06:23.056512827 +0100 +++ /var/tmp/diff_new_pack.JfMUVk/_new 2020-02-25 16:06:23.060512836 +0100 @@ -1,7 +1,7 @@ # # spec file for package grc # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,17 +12,17 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: grc -Version: 1.11.1 +Version: 1.11.3 Release: 0 Summary: Generic colouriser for everything -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Console -Url: http://kassiopeia.juls.savba.sk/~garabik/software/grc.html +URL: http://kassiopeia.juls.savba.sk/~garabik/software/grc.html Source: https://github.com/garabik/grc/archive/v%{version}.tar.gz#/v%{version}.tar.gz # https://github.com/simotek/grc-osc-conf Source1: conf.osc @@ -41,6 +41,9 @@ # Nothing to build. %install +# fix wrong wrong-script-interpreter +find . -name 'grc' -exec sed -i "s|#! %{_bindir}/env python3$|#!/usr/bin/python3|" {} + +find . -name 'grcat' -exec sed -i "s|#! %{_bindir}/env python3$|#!/usr/bin/python3|" {} + install -Dm 0755 grc %{buildroot}%{_bindir}/grc install -Dm 0755 grcat %{buildroot}%{_bindir}/grcat install -Dm 0644 grc.conf %{buildroot}%{_sysconfdir}/grc.conf ++++++ v1.11.1.tar.gz -> v1.11.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/_grc new/grc-1.11.3/_grc --- old/grc-1.11.1/_grc 1970-01-01 01:00:00.000000000 +0100 +++ new/grc-1.11.3/_grc 2018-04-29 16:12:55.000000000 +0200 @@ -0,0 +1,25 @@ +#compdef grc + +setopt localoptions extended_glob + +local environ e cmd +local -a args +local -a _comp_priv_prefix + +zstyle -a ":completion:${curcontext}:" environ environ + +for e in "${environ[@]}" +do local -x "$e" +done + +args=( + '(-e --stderr)'{-e,--stderr}'[redirect stderr; do not automatically redirect stdout]' + '(-s --stdout)'{-s,--stdout}'[redirect stdout; even with -e/--stderr]' + '(-c <name>--config=<name>)'{-c+,--config=-}'[use <name> as configuration file for grcat]:file:_files' + '--color=-[colo?urize output]:color:(on off auto)' + '(-h --help)'{-h,--help}'[display help message and exit]' + '--pty[run command in pseudotermnial (experimental)]' + '*::arguments:{ _normal }' +) + +_arguments -s $args diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/colourfiles/conf.blkid new/grc-1.11.3/colourfiles/conf.blkid --- old/grc-1.11.1/colourfiles/conf.blkid 2017-05-21 16:46:51.000000000 +0200 +++ new/grc-1.11.3/colourfiles/conf.blkid 2018-04-29 16:12:55.000000000 +0200 @@ -8,16 +8,24 @@ ====== # UUID regexp=\sUUID="([^"]+) -colours=default,blue +colours=bold yellow,blue +====== +#UUID_SUB +regexp=\sUUID_SUB="([^"]+) +colours=green,bright_green ====== # TYPE regexp=TYPE="([^"]+) -colours=default,cyan +colours=bold cyan,cyan ====== # LABEL -regexp=LABEL="([^"]+) -colours=default,bright_cyan +regexp=\sLABEL="([^"]+) +colours=bold bright_cyan,bright_cyan ====== +# PARTLABEL +regexp=\sPARTLABEL="([^"]+) +colours=bold green,red # PARTUUID regexp=PARTUUID="([^"]+) -colours=default,magenta +colours=green,magenta + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/colourfiles/conf.df new/grc-1.11.3/colourfiles/conf.df --- old/grc-1.11.1/colourfiles/conf.df 2017-05-21 16:46:51.000000000 +0200 +++ new/grc-1.11.3/colourfiles/conf.df 2018-04-29 16:12:55.000000000 +0200 @@ -1,7 +1,7 @@ # FS #regexp=^.*?\s -regexp=^(?!Filesystem).*?\s -colours=green +regexp=^(?!Filesystem)(\/[-\w\d.]+)+\s +colours=blue,bold blue ====== # Size 'K' regexp=\s\d*[.,]?\dKi?\s @@ -20,25 +20,25 @@ colours=bold red ====== # Mounted on -regexp=/[-\w\d./]*$ -colours=bold green +regexp=\/$|(\/[-\w\d. ]+)+$ +colours=green,bold green ====== # Use 0-60% -regexp=[1-6][0-9]?%|0% +regexp=[\b1-6][0-9]?%|0% colours=green ====== # Use 70-90% regexp=[7-9][0-9]% colours=yellow ====== -# Use 90-95 -regexp=[9][0-5]% +# Use 90-97 +regexp=9[0-7]% colours=red ====== -# Use 95-100 -regexp=[9][5-9]%|100% +# Use 98-100 +regexp=9[8-9]%|100% colours=bold red - +====== # tmpfs lines regexp=^tmpfs.* colours=bright_black diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/colourfiles/conf.docker-machinels new/grc-1.11.3/colourfiles/conf.docker-machinels --- old/grc-1.11.1/colourfiles/conf.docker-machinels 2017-05-21 16:46:51.000000000 +0200 +++ new/grc-1.11.3/colourfiles/conf.docker-machinels 2018-04-29 16:12:55.000000000 +0200 @@ -16,7 +16,7 @@ ====== # PORTS regexp=((?:\d{1,3}\.){3}\d{1,3}):(\d+) -colours=default,blue,bold blue +colours=default,blue,bold blue ====== # Error Line regexp=^error\s(?:\w+\s)+([a-z\-_0-9]+):(.*)$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/colourfiles/conf.dockerimages new/grc-1.11.3/colourfiles/conf.dockerimages --- old/grc-1.11.1/colourfiles/conf.dockerimages 2017-05-21 16:46:51.000000000 +0200 +++ new/grc-1.11.3/colourfiles/conf.dockerimages 2018-04-29 16:12:55.000000000 +0200 @@ -1,43 +1,63 @@ -# HEADERS -regexp=(?:\s|^)(REPOSITORY|TAG|IMAGE ID|CREATED|SIZE)(?:\s|$) -colours=default,underline -===== -# REPO, TAG -regexp=^([a-z]+\/?[^\s]+)\s+([^\s]+) -colours=default,bold white,cyan,bold black -======= # REPO, TAG, IMAGE ID regexp=^([a-z]+\/?[^\s]+)\s+([^\s]+)\s+(\w+) colours=default,bold white,bright_cyan,bright_black ===== # latest -regexp=\s+(latest)\s+ -colours=unchanged,cyan +regexp=(?<=\s)latest(?=\s+) +colours=dark cyan ===== # REPOSITORY (Image name) -regexp=^(?:([a-z\-_0-9]+)/)*([a-z\-_0-9]+)\s +regexp=^(?:(\S+)\/)*(\S+)\s colours=default,yellow,bright_white ===== # images without name regexp=^<none>.*$ colours=bold red ===== +# images without tag +regexp=\s+(<none>)\s+ +colours=unchanged,bold red +===== # Size 'K' -regexp=\s\d*[\.,]?\d*\sKB? +regexp=(?<=\s)\d+[.,]?\d*\s?(KB?|B) colours=green ====== # Size 'M', 2 digits -regexp=\s\d{1,2}[\.,]?\d*\sMB? +regexp=(?<=\s)\d{1,2}[.,]?\d*\s?MB? colours=green ====== # Size 'M' 3+ digits -regexp=\s\d{3,4}[\.,]?\d*\sMB? +regexp=(?<=\s)\d{3,4}[.,]?\d*\s?MB? colours=yellow ====== # Size 'G' -regexp=\s\d*[\.,]?\d*\sGB? +regexp=(?<=\s)\d+[.,]?\d*\s?GB? colours=red +===== +# CREATED seconds/minutes +regexp=[\da-f]{12}\s+((?:About a|\d+) (?:seconds?|minutes?) ago) +colours=unchanged,on_green bold white +====== +# CREATED About a minute ago +regexp=\s+(About a minute ago)\s\w+ +colours=unchanged,on_green bold white ====== -# Date Ago -regexp=(?:\s{2}|^)(?:\w+\s)+ago -colours=cyan +# CREATED hours +regexp=\s+(\d+\shours\s\w+) +colours=unchanged,bright_green +====== +# CREATED days +regexp=\s+(\d+\sdays\s\w+) +colours=unchanged,green +====== +# CREATED weeks +regexp=\s+(\d+\sweeks\s\w+) +colours=unchanged,yellow +====== +# CREATED months +regexp=\s+(\d+\smonths\s\w+) +colours=unchanged,red +===== +# HEADERS +regexp=(?:\s|^)(REPOSITORY|TAG|IMAGE ID|CREATED|SIZE)(?:\s|$) +colours=default,underline diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/colourfiles/conf.dockerinfo new/grc-1.11.3/colourfiles/conf.dockerinfo --- old/grc-1.11.1/colourfiles/conf.dockerinfo 2017-05-21 16:46:51.000000000 +0200 +++ new/grc-1.11.3/colourfiles/conf.dockerinfo 2018-04-29 16:12:55.000000000 +0200 @@ -1,9 +1,9 @@ # Main Nodes -regexp=^(\S[^:]+):\s(.*)$ +regexp=^(\S[^:]+):\s?(.*)?$ colours=default,cyan ====== # Sub Nodes -regexp=^\s([^:]+):\s(.*)$ +regexp=^\s([^:]+):\s?(.*)?$ colours=default,magenta ====== # Warning diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/colourfiles/conf.dockernetwork new/grc-1.11.3/colourfiles/conf.dockernetwork --- old/grc-1.11.1/colourfiles/conf.dockernetwork 2017-05-21 16:46:51.000000000 +0200 +++ new/grc-1.11.3/colourfiles/conf.dockernetwork 2018-04-29 16:12:55.000000000 +0200 @@ -1,23 +1,23 @@ # HEADERS -regexp=(?:\s|^)(NETWORK ID|NAME|DRIVER)(?:\s|$) +regexp=(?:\s|^)(NETWORK ID|NAME|DRIVER|SCOPE)(?:\s|$) colours=default,underline - # Line regexp=^(?!NETWORK)(\S+)\s+(\S+) -colours=default,green,bright_blue +colours=unchanged,bright_black,bright_blue - -# Bridge -regexp=bridge\s+$ -colours=cyan +# Driver BRIDGE +regexp=^\S+\s+\S+\s+(bridge) +colours=unchanged,bright_cyan - -# host -regexp=host\s+$ -colours=bright_cyan +# Driver HOST +regexp=^\S+\s+\S+\s+(host) +colours=unchanged,cyan - -# overlay -regexp=overlay\s+$ -colours=magenta +# Driver OVERLAY +regexp=^\S+\s+\S+\s+(overlay) +colours=unchanged,magenta - -# null -regexp=null\s+$ -colours=red +# Driver NULL +regexp=^\S+\s+\S+\s+(null) +colours=unchanged,on_red white diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/colourfiles/conf.dockerps new/grc-1.11.3/colourfiles/conf.dockerps --- old/grc-1.11.1/colourfiles/conf.dockerps 2017-05-21 16:46:51.000000000 +0200 +++ new/grc-1.11.3/colourfiles/conf.dockerps 2018-04-29 16:12:55.000000000 +0200 @@ -1,15 +1,18 @@ -# This is for docker ps and docker-compose ps -# Headers -regexp=(?:\s{2}|^)(CONTAINER ID|IMAGE|COMMAND|CREATED|STATUS|PORTS|NAMES|Name|Command|State|Ports)(?:\s|$) +# HEADERS +regexp=(?:\s|^)(CONTAINER ID|IMAGE|COMMAND|CREATED|STATUS|PORTS|NAMES)(?:\s|$) colours=default,underline ====== -# Commands (docker ps) -regexp=(?:\s{2}|^)(?:\s\")(.*)(?:\")(?:\s{2}|$) -colours=magenta -======= -# Date Ago (docker ps) -regexp=(?:\s{2}|^)(?:\w+\s)+ago -colours=cyan +# IMAGE NAME (as docker image) +regexp=\s{2,}(?:([a-z\-_0-9]+)\/)*([a-z\-_0-9]+)(:\S+)?\s{2,}\" +colours=unchanged,yellow,bright_white,cyan +====== +# IMAGE +regexp=^(?!CONTAINER)(\w+)\s+([^\s]+)\s+(".*")\s+(.*(?=(?:Up|Exited|Created|Restarting))) +colours=unchanged,bright_black,unchanged,bright_black,cyan +====== +# Statuses - Created +regexp=\sCreated\s +colours=blue ====== # Statuses # https://github.com/docker/docker/blob/e5a3f86e447dd659da3c2e759f3c088a0bfcfe3d/container/state.go#L40 @@ -17,18 +20,18 @@ regexp=(?:\s{2}|^)(?:Up|Restarting)(?:(?:\s[\w,\d,(,)]+)+)? colours=bold green ====== -# Exited -regexp=(?:\s{2}|^)(?:Exited|Exit|Dead|Removal In Progress)(?:(?:\s[\w,\d,(,)]+)+)? -colours=bold red -======= +# Statuses - Exited +regexp=Exited\s.(\d+).+?(?=\s{2,}) +colours=bold red,red +====== +# Statuses - Restarting +regexp=Restarting\s.(\d+).+?(?=\s{2,}) +colours=bold blue +====== # Ip Addresses / Ports -regexp=(?:\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(\:)?(\d{1,5}))?(->)?(\d{1,5})(\/)(\w+) -colours=blue,default,bright_green,default,bright_green,default,bright_blue -======= -# Name and command in docker-compose ps. -regexp=(?:\s{2}|^)(?:[a-z\-_0-9]+)(?:\s{2}|$)(?:\s+(.+?)\s{2,})? -colours=bold yellow,magenta -======= -# Container ID / Image ID and Image. Need to be together to override the "name" regex. -regexp=(?:\s{2}|^)([a-z0-9]+)\s{2,}((?:(?:[a-z\-_0-9\.]+)+(\/|:)?)+) -colours=default,cyan,default +regexp=(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(\:)?(\d{1,5}))?(?:->)?(\d{1,5}(\/)\w+) +colours=default,blue,default,bright_green,bright_blue,default +====== +# NAMES +regexp=(?:([a-z\-_0-9]+)\/)*([a-z\-_0-9]+)$ +colours=default,yellow,on_blue white diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/colourfiles/conf.gcc new/grc-1.11.3/colourfiles/conf.gcc --- old/grc-1.11.1/colourfiles/conf.gcc 2017-05-21 16:46:51.000000000 +0200 +++ new/grc-1.11.3/colourfiles/conf.gcc 2018-04-29 16:12:55.000000000 +0200 @@ -1,9 +1,9 @@ -# +# regexp=\b(g?cc|[gc]\+\+|g?as|ld)\b colours=white bold count=once ......... -# +# regexp=^[^:\s]*?:\d+: colours=bold magenta ......... @@ -11,7 +11,7 @@ colours=cyan count=once ......... -# +# regexp=\`[A-Za-z0-9_():&*]+( const)?\' colours=magenta ......... @@ -28,7 +28,7 @@ colours=yellow ......... # warning and error won't work, unless you redirect also -# stderr to grcat +# stderr to grcat # # warning regexp=[Ww]arning[:\b] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/colourfiles/conf.ip new/grc-1.11.3/colourfiles/conf.ip --- old/grc-1.11.1/colourfiles/conf.ip 2017-05-21 16:46:51.000000000 +0200 +++ new/grc-1.11.3/colourfiles/conf.ip 2018-04-29 16:12:55.000000000 +0200 @@ -36,7 +36,7 @@ # "linkdown" regexp=linkdown colours=bold red -- +- # "src" regexp=src \S+ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/colourfiles/conf.irclog new/grc-1.11.3/colourfiles/conf.irclog --- old/grc-1.11.1/colourfiles/conf.irclog 2017-05-21 16:46:51.000000000 +0200 +++ new/grc-1.11.3/colourfiles/conf.irclog 2018-04-29 16:12:55.000000000 +0200 @@ -24,7 +24,7 @@ ======= # everything in parentheses regexp=\(.+?\) -colours=green +colours=green count=more ======= # channel name diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/colourfiles/conf.iwconfig new/grc-1.11.3/colourfiles/conf.iwconfig --- old/grc-1.11.1/colourfiles/conf.iwconfig 1970-01-01 01:00:00.000000000 +0100 +++ new/grc-1.11.3/colourfiles/conf.iwconfig 2018-04-29 16:12:55.000000000 +0200 @@ -0,0 +1,70 @@ +# no wireless extensions +regexp=\bno wireless extensions +colours=red +======= +# Frequency +regexp=[0-9\.]{1,10} GHz +colours=bold green +======= +# Type +regexp=802\.11([a-z]+) +colours=bold yellow +======= +# Speed +regexp=[0-9]+ Mb/s +colours=bold yellow +======= +# Tx-Power +regexp=\-?[0-9]+ dBm +colours=bold green +======= +# ipv4 +regexp=\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} +colours=bold green +======= +# ipv6 +regexp=\b[0-9a-fA-F]{1,4}(\:\:?[0-9a-fA-F]{1,4})+ +colours=bold green +======= +# hwaddr +regexp=(\d|[a-f]){2}(\:(\d|[a-f]){2}){5} +colours=yellow +======= +# size +regexp=\d+(\.\d+)?\s(T|G|M|K|)i?B +colours=yellow +======= +# interface +regexp=^([a-z0-9]{2,}\d*):?\s +colours=bold green +======= +#ip disc +regexp=(inet6?|netmask|broadcast) +colours=cyan +======= +#flags +regexp=(?<=[,<])[^,]+?(?=[,>]) +colours=blue +======= +# mtu +regexp=(?i)mtu(\s|\:)\d+ +colours=green +======= +#errors +regexp=errors(\s|\:)\d+ +colours=red +======= +regexp=dropped(\s|\:)\d+ +colours=white +======= +regexp=overruns(\s|\:)\d+ +colours=green +======= +regexp=frame(\s|\:)\d+ +colours=white +======= +regexp=carrier(\s|\:)\d+ +colours=cyan +======= +regexp=collisions(\s|\:)\d+ +colours=red diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/colourfiles/conf.jobs new/grc-1.11.3/colourfiles/conf.jobs --- old/grc-1.11.1/colourfiles/conf.jobs 1970-01-01 01:00:00.000000000 +0100 +++ new/grc-1.11.3/colourfiles/conf.jobs 2018-04-29 16:12:55.000000000 +0200 @@ -0,0 +1,9 @@ +# BASH +regexp=\[(\d+)\](.) +(\d+)?\s? +colour=unchanged, cyan, yellow, magenta +- +regexp=Running.* +colour=bold green +- +regexp=Stopped.* +colour=red diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/colourfiles/conf.ldap new/grc-1.11.3/colourfiles/conf.ldap --- old/grc-1.11.1/colourfiles/conf.ldap 2017-05-21 16:46:51.000000000 +0200 +++ new/grc-1.11.3/colourfiles/conf.ldap 2018-04-29 16:12:55.000000000 +0200 @@ -1,5 +1,5 @@ # Intended for colouring LDIF output (from ldap tools) -# comments +# comments regexp=^#.* colours=green count=stop diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/colourfiles/conf.lolcat new/grc-1.11.3/colourfiles/conf.lolcat --- old/grc-1.11.1/colourfiles/conf.lolcat 1970-01-01 01:00:00.000000000 +0100 +++ new/grc-1.11.3/colourfiles/conf.lolcat 2018-04-29 16:12:55.000000000 +0200 @@ -0,0 +1,7 @@ +#Message +regexp=([^\w\d]+) +colours=unchanged +====== +regexp=([a-zA-Z0-9]+) +colours=default,green,yellow,red + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/colourfiles/conf.ls new/grc-1.11.3/colourfiles/conf.ls --- old/grc-1.11.1/colourfiles/conf.ls 2017-05-21 16:46:51.000000000 +0200 +++ new/grc-1.11.3/colourfiles/conf.ls 2018-04-29 16:12:55.000000000 +0200 @@ -5,15 +5,21 @@ # Example lines: # -rw-r--r-- 1 user staff 344M Mar 22 22:51 MVI_8735.m4v # -rw-r--r-- 1 user staff 360050327 Mar 22 22:51 MVI_8735.m4v +# -rw-r--r--. 1 user staff 1.0G Nov 23 16:13 testg +# -rw-r--r--. 1 user staff 1.0K Nov 23 16:13 testk +# -rw-r--r--. 1 user staff 1.0M Nov 23 16:13 testm +# -rw-r--r--. 1 user staff 1073741824 Nov 23 16:13 testg +# -rw-r--r--. 1 user staff 1024 Nov 23 16:13 testk +# -rw-r--r--. 1 user staff 1048576 Nov 23 16:13 testm # # The regexp uses lookahead to match a date following the size # size: 1M <= size < 10M -regexp=\s+(\d{7}|\d([,\.]\d+)?M)(?=\s[A-Z][a-z]{2}\s) +regexp=\s+(\d{7}|\d(?:[,.]?\d+)?[KM])(?=\s[A-Z][a-z]{2}\s) colours=green ======= # size: 10M <= size < 100M -regexp=\s+(\d{8}|\d\d([,\.]\d+)?M)(?=\s[A-Z][a-z]{2}\s) +regexp=\s+(\d{8}|\d\d(?:[,.]?\d+)?M)(?=\s[A-Z][a-z]{2}\s) colours=yellow ======= # size: 100M <= size < 1G @@ -21,24 +27,17 @@ colours=red ======= # size: 1G <= size -regexp=\s+(\d{10,}|[\d\.,]+G)(?=\s[A-Z][a-z]{2}\s) +regexp=\s+(\d{10,}|[\d.,]+G)(?=\s[A-Z][a-z]{2}\s) colours=bold red ======= # device major minor numbers regexp=\s(\d+),\s+(\d+)\s colours=default,bright_yellow ,yellow ======= -# time -regexp=(\s|^)[0-2]?\d(:[0-5]\d)(?=[\s,]|$) -colours=white -======= -# month -#regexp=\s[A-Z][a-z]{2}\s -#colours=yellow -#======= -#regexp=(?<=\d):(?=\d) -#colours=bold yellow -#======= +# Date-Time => G1=Month G2=Day G3=Hour G4=Minutes G5=Year +regexp=([A-Z][a-z]{2})\s([ 1-3]\d)\s(?:([0-2]?\d):([0-5]\d)(?=[\s,]|$)|\s*(\d{4})) +colours=unchanged,cyan,cyan,cyan,cyan,bold magenta +======= # root regexp=\s(root|wheel)(?=\s|$) colours=unchanged,bold white on_red diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/colourfiles/conf.lsattr new/grc-1.11.3/colourfiles/conf.lsattr --- old/grc-1.11.1/colourfiles/conf.lsattr 2017-05-21 16:46:51.000000000 +0200 +++ new/grc-1.11.3/colourfiles/conf.lsattr 2018-04-29 16:12:55.000000000 +0200 @@ -1,7 +1,3 @@ -# Filename -regexp=\S+\s(\S+) -colours=bold -- # Normal regexp=[aAcCdDeijsStTu] colours=cyan @@ -12,8 +8,16 @@ - # Read Only regexp=[EhINXZ] -colours=red +colours=bold red - # Separators regexp=[\-] colours=dark +- +# Error +regexp=(lsattr:) \w.* +colours=default, bold red +- +# Filename +regexp=(\/[-\w\d. ]+)+$ +colours=yellow,bold diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/colourfiles/conf.lsblk new/grc-1.11.3/colourfiles/conf.lsblk --- old/grc-1.11.1/colourfiles/conf.lsblk 2017-05-21 16:46:51.000000000 +0200 +++ new/grc-1.11.3/colourfiles/conf.lsblk 2018-04-29 16:12:55.000000000 +0200 @@ -11,23 +11,23 @@ colours=default,default,bright_cyan ====== # Type crypt -regexp=\scrypt\s +regexp=(?<=\s)crypt\b colours=on_magenta white ====== # Type disk -regexp=\sdisk\s +regexp=(?<=\s)disk\b colours=magenta ====== # Type lvm -regexp=\slvm\s +regexp=(?<=\s)lvm\b colours=bold cyan ====== # Type part -regexp=\spart\s +regexp=(?<=\s)part\b colours=cyan ====== # Type loop -regexp=\sloop\s +regexp=(?<=\s)loop\b colours=bright_red ====== # Size 'K' @@ -46,10 +46,14 @@ regexp=\s\d*[.,]?\dTi?\s colours=bold red ====== -# Mount -regexp=\s\/.*$ -colours=bold yellow +# Mount Path +regexp=(?<=\s)(\/[^\/ ]*)+$ +colours=yellow,bold yellow ====== # Mount [SWAP] regexp=\s\[(SWAP)\] colours=default,bright_magenta +====== +# UUID +regexp=(?<=\s)\b([0-9a-fA-F-]{4,}|[\w-]{38})\b +colours=default,dark cyan diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/colourfiles/conf.mount new/grc-1.11.3/colourfiles/conf.mount --- old/grc-1.11.1/colourfiles/conf.mount 2017-05-21 16:46:51.000000000 +0200 +++ new/grc-1.11.3/colourfiles/conf.mount 2018-04-29 16:12:55.000000000 +0200 @@ -3,9 +3,23 @@ regexp=^(.*) on (.*) type (.*) \((.*)\) colours=default,green,yellow,blue,magenta -===== -regexp=^cgroup.* -colours=bright_black -===== -regexp=^tmpfs.* +- +# Devices +regexp=^(\/[^\/ ]+)+ +colours=bold green, on_green black +- +# Mount Path +regexp=(?<=on )(\/[^\/ ]+)+ +colours=unchanged,underline yellow +- +# RW +regexp=(?<=\()rw +colours=bold red +- +# RO +regexp=(?<=\()ro +colours=bold green +- +# Like comment, leave at end always +regexp=^(cgroup|tmpfs).* colours=bright_black diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/colourfiles/conf.mount.old new/grc-1.11.3/colourfiles/conf.mount.old --- old/grc-1.11.1/colourfiles/conf.mount.old 2017-05-21 16:46:51.000000000 +0200 +++ new/grc-1.11.3/colourfiles/conf.mount.old 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -#/full/path -regexp=\s/[-\w\d.]+(\s|/[-\w\d./]+) -colours=cyan -======= -#filesystem -regexp=^\w+\s -colours=yellow -======= -#type filesystem -#regexp=(?<=type)\s* -#colours=red -#======= -# /dev/sda -regexp=^(/dev/)?[s]d[a-f][0-9]*(?=[^\w\d]|$) -colours=bold green -======= -#mount options -regexp=(?<=[,(])[^,]*(?=[,)]) -colours=green diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/colourfiles/conf.mtr new/grc-1.11.3/colourfiles/conf.mtr --- old/grc-1.11.1/colourfiles/conf.mtr 2017-05-21 16:46:51.000000000 +0200 +++ new/grc-1.11.3/colourfiles/conf.mtr 2018-04-29 16:12:55.000000000 +0200 @@ -2,9 +2,9 @@ regexp=\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} colours=green ======= -# % -regexp=[0-9]{1,2}\.\d{1}% -colours=yellow +# 0 Full Line | 1 Loss | 2 Snt | 3 Last | 4 Avg | 5 Best | 6 Worst | 7 stDev +regexp=(\d+\.\d%)\s+(\d+)\s+(\d+\.\d)\s+(\d+\.\d)\s+(\d+\.\d)\s+(\d+\.\d)\s+(\d+\.\d)$ +colours=unchanged,yellow,unchanged,unchanged,blue,green,red,unchanged ======= # unknow host regexp=\?\?\? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/colourfiles/conf.ntpdate new/grc-1.11.3/colourfiles/conf.ntpdate --- old/grc-1.11.1/colourfiles/conf.ntpdate 1970-01-01 01:00:00.000000000 +0100 +++ new/grc-1.11.3/colourfiles/conf.ntpdate 2018-04-29 16:12:55.000000000 +0200 @@ -0,0 +1,8 @@ +# time offset +regexp=offset\s([0-9\.,\-]+\ssec) +colours=unchanged,bold green +====== +# server ip +regexp=server\s([0-9a-fA-F\.:]+) +colours=unchanged,yellow + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/colourfiles/conf.ping new/grc-1.11.3/colourfiles/conf.ping --- old/grc-1.11.1/colourfiles/conf.ping 2017-05-21 16:46:51.000000000 +0200 +++ new/grc-1.11.3/colourfiles/conf.ping 2018-04-29 16:12:55.000000000 +0200 @@ -1,45 +1,53 @@ -# name -regexp=(?:[fF]rom|PING)\s(\S+)\s -colours=default,blue +# IP +regexp=\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} +colours=bright_blue ======= # ipv6 number regexp=(([0-9a-fA-F]{1,4})?\:\:?[0-9a-fA-F]{1,4})+ colours=magenta ======= -# ip number, optional port -regexp=\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(\:[0-9]{1,5})? -colours=bright_blue -======= -# icmp_[sr]eq=# -regexp=icmp_[sr]eq=(\d+) +# icmp_seq=## +regexp=icmp_seq=(\d+) colours=default,yellow ======= +# ttl=# +regexp=ttl=(\d+) +colours=default,magenta +======= +# name +regexp=(?:[fF]rom|PING)\s(\S+)\s +colours=default,blue +======= # time regexp=([0-9\.]+)\s?ms -colours=default,green +colours=green,bold green ======= # DUP regexp=DUP\! colours=red ======= -# Destination Host Unreachable -regexp=Destination Host Unreachable +# OK +regexp=0% packet loss +colours=green +======= +# Errors +regexp=(Destination Host Unreachable|100% packet loss) colours=red ======= # unknown host regexp=.+unknown\shost\s(.+) colours=red,bold red - -# statustics header -regexp=--- \S+ ping statistics --- -colours=bold +# statistics header +regexp=--- (\S+) ping statistics --- +colours=bold, bold blue - # last line min/avg/max/mdev -regexp=(min)/(avg)/(max)/(mdev) +regexp=rtt (min)/(avg)/(max)/(mdev) colours=default,bright_yellow,bright_blue,bright_red,bright_magenta - # last line values -regexp=\=\s([0-9\.\ mus]+)\/([0-9\. mus]+)\/([0-9\. mus]+)\/([0-9\. mus]+) +regexp=\=\s([0-9\.]+)\/([0-9\.]+)\/([0-9\.]+)\/([0-9\.]+) colours=default,bright_yellow,bright_blue,bright_red,bright_magenta - # these are good for nping diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/colourfiles/conf.pv new/grc-1.11.3/colourfiles/conf.pv --- old/grc-1.11.1/colourfiles/conf.pv 2017-05-21 16:46:51.000000000 +0200 +++ new/grc-1.11.3/colourfiles/conf.pv 2018-04-29 16:12:55.000000000 +0200 @@ -2,7 +2,7 @@ regexp=(\s|^)\d+([.,]\d+)?\s?([kKMG][bB]|[bB]|[kKMG])(?=[\s,]|$) colours=yellow ======= -# +# regexp=<=> colours=yellow diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/colourfiles/conf.sensors new/grc-1.11.3/colourfiles/conf.sensors --- old/grc-1.11.1/colourfiles/conf.sensors 1970-01-01 01:00:00.000000000 +0100 +++ new/grc-1.11.3/colourfiles/conf.sensors 2018-04-29 16:12:55.000000000 +0200 @@ -0,0 +1,12 @@ +# Adapetr +regexp=Adapter:\s(.*) +colours=default, green +====== +# High temperature +regexp=.+:\s+(\+[67][0-9][^0-9]) +colours=default, red +====== +# Very high temperature +regexp=.+:\s+(\+[89][0-9][0-9]?) +colours=default, blink red +====== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/colourfiles/conf.sysctl new/grc-1.11.3/colourfiles/conf.sysctl --- old/grc-1.11.1/colourfiles/conf.sysctl 2017-05-21 16:46:51.000000000 +0200 +++ new/grc-1.11.3/colourfiles/conf.sysctl 2018-04-29 16:12:55.000000000 +0200 @@ -1,9 +1,11 @@ -# Main -regexp=(\w+)\.(\S+) = (.+)$ -colours=default,bright_green,cyan,yellow +# Main & Last key +regexp=(\w+)\.(\S+) = ?(.+)?$ +colours=default,green,cyan,yellow - -# subcategory +# subcategories regexp=\w+\.(\S+(?=\.))\. -colours=unchanged,bright_cyan - - +colours=unchanged,magenta +- +# error +regexp=sysctl: permission denied on key '([^']+)' +colours=red,bold red diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/colourfiles/conf.traceroute new/grc-1.11.3/colourfiles/conf.traceroute --- old/grc-1.11.1/colourfiles/conf.traceroute 2017-05-21 16:46:51.000000000 +0200 +++ new/grc-1.11.3/colourfiles/conf.traceroute 2018-04-29 16:12:55.000000000 +0200 @@ -1,6 +1,6 @@ # hostname regexp=\s\w+[\w\-\.]+\w+ -colours=bright_yellow +colours=bold white count=once - # ip number diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/colourfiles/conf.whois new/grc-1.11.3/colourfiles/conf.whois --- old/grc-1.11.1/colourfiles/conf.whois 1970-01-01 01:00:00.000000000 +0100 +++ new/grc-1.11.3/colourfiles/conf.whois 2018-04-29 16:12:55.000000000 +0200 @@ -0,0 +1,76 @@ +# field +regexp=^([\w\s])*: +colours=bold white +======= +# data +regexp=:\s[\w\s\W\S]*$ +colour=blue +======= +# comments +regexp=^([;%])([\s\w\S\W])*$ +colours=yellow +======= +# comments +regexp=(^(---)|(>>>))[\s\w\S\W]*$ +colours=yellow +======= +# domain +regexp=(([\w\d]([\w\d-])+\.){1,})([\w\d-]{2,}) +colours=green +======= +# url +regexp=http[s]?://(([\w\d]([\w\d-])+\.){1,})([\w\d-]{2,})(/[\w\d\S\s]*)* +colours=bold green +======= +# phone +regexp=\+([\d\.]*) +colours=bold yellow +======= +# email +regexp=([\d\w\S])+@(([\w\d]([\w\d-])+\.){1,})([\w\d-]{2,}) +colours=bold blue +======= +# date +regexp=([\d]{4}[- ](([\d]{2})|([a-zA-Z]{3,}))[ -][\d]{2})|([\d]{2}[ -](([a-zA-Z]{3,})|([\d]{2}))[ -][\d]{4}) +colours=bold red +======= +# time +regexp=[\d]{2}:[\d]{2}:[\d]{2}((\.[\d]*[Z]?)|(\+[\d]*))? +colours=red +======= +# NOTICE +regexp=NOTICE +colours=bold blue +======= +# TERM OF USE +regexp=TERMS OF USE +colours=bold blue +======= +# registrar +regexp=(Sponsoring )?[Rr]egistrar([\w\s\S])*: +colours=bold cyan +======= +# registrant +regexp=(Registry )?[Rr]egistrant([\w\s\S])*: +colours=bold blue +======= +# admin +regexp=(Registry )?[Aa]dmin([\w\s\S])*: +colours=bold magenta +======= +# tech +regexp=(Registry )?[Tt]ech([\w\s\S])*: +colours=bold yellow +======= +# billing +regexp=(Registry )?[Bb]illing([\w\s\S])*: +colours=bold green +======= +# NS +regexp=((nserver)|(Name Server)): +colours=bold green +======= +# domain status +regexp=(Domain Status)|(status) +colours=bold red + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/debian/README.Debian new/grc-1.11.3/debian/README.Debian --- old/grc-1.11.1/debian/README.Debian 2017-05-21 16:46:51.000000000 +0200 +++ new/grc-1.11.3/debian/README.Debian 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -grc ----------------------- - -packaged as native package - - -- Radovan Garabík <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/debian/changelog new/grc-1.11.3/debian/changelog --- old/grc-1.11.1/debian/changelog 2017-05-21 16:46:51.000000000 +0200 +++ new/grc-1.11.3/debian/changelog 2018-04-29 16:12:55.000000000 +0200 @@ -1,6 +1,25 @@ +grc (1.11.3-1) unstable; urgency=medium + + * add new configurations + * --colour=auto is now the default + * add dh-python build dependency (closes: #896743) + + -- Radovan Garabík <[email protected]> Sun, 29 Apr 2018 16:12:14 +0200 + +grc (1.11.2-1) unstable; urgency=low + + * add ntpdate configuration command + + -- Radovan Garabík <[email protected]> Sat, 23 Sep 2017 20:35:33 +0200 + +grc (1.11.1-2) unstable; urgency=low + + * fixed python2 compatibility errors (forgotten old changelog commit) + -- Radovan Garabík <[email protected]> Wed, 07 Jun 2017 15:01:11 +0200 + grc (1.11.1-1) unstable; urgency=low - * better error handling if command is not found + * fixed python2 compatibility errors -- Radovan Garabík <[email protected]> Sun, 21 May 2017 16:01:51 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/debian/control new/grc-1.11.3/debian/control --- old/grc-1.11.1/debian/control 2017-05-21 16:46:51.000000000 +0200 +++ new/grc-1.11.3/debian/control 2018-04-29 16:12:55.000000000 +0200 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Radovan Garabík <[email protected]> Standards-Version: 3.9.6 -Build-Depends: debhelper (>=9), python3 +Build-Depends: debhelper (>=9), python3, dh-python Package: grc Architecture: all diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/grc new/grc-1.11.3/grc --- old/grc-1.11.1/grc 2017-05-21 16:46:51.000000000 +0200 +++ new/grc-1.11.3/grc 2018-04-29 16:12:55.000000000 +0200 @@ -6,11 +6,11 @@ def version(): - print ("Generic Colouriser 1.11.1") + print ("Generic Colouriser 1.11.3") sys.exit() def help(): - print("""Generic Colouriser 1.11.1 + print("""Generic Colouriser 1.11.3 grc [options] command [args] Options: -e --stderr redirect stderr. If this option is selected, @@ -46,7 +46,7 @@ # configure file for grcat cfile = "" -colour = 1 +colour = sys.stdout.isatty() use_pty = 0 for i in optlist: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/grc.bashrc new/grc-1.11.3/grc.bashrc --- old/grc-1.11.1/grc.bashrc 2017-05-21 16:46:51.000000000 +0200 +++ new/grc-1.11.3/grc.bashrc 2018-04-29 16:12:55.000000000 +0200 @@ -36,7 +36,7 @@ alias ps='colourify ps' alias mtr='colourify mtr' alias semanage='colourify semanage' - alias getsebool='colourify setsebool' + alias getsebool='colourify getsebool' alias ifconfig='colourify ifconfig' fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/grc.conf new/grc-1.11.3/grc.conf --- old/grc-1.11.1/grc.conf 2017-05-21 16:46:51.000000000 +0200 +++ new/grc-1.11.3/grc.conf 2018-04-29 16:12:55.000000000 +0200 @@ -47,7 +47,7 @@ conf.wdiff # last/who command -(^|[/\w\.]+/)(last|who)\s? +(^|[/\w\.]+/)(lastb?|who|lastlog)\b conf.last # ldap tools @@ -251,13 +251,17 @@ conf.nmap # uptime | w -(^|[/\w\.]+/)(uptime|w)\s? +(^|[/\w\.]+/)(uptime|w)\b conf.uptime # getfacl (^|[/\w\.]+/)getfacl\s? conf.getfacl +# ntpdate +(^|[/\w\.]+/)ntpdate\s? +conf.ntpdate + # showmount (^|[/\w\.]+/)showmount\s? conf.showmount @@ -270,3 +274,16 @@ (^|[/\w\.]+/)mvn\s? conf.mvn +# iwconfig command +(^|[/\w\.]+/)iwconfig\s? +conf.iwconfig + + +# lolcat command +(^|[/\w\.]+/)lolcat\s? +conf.lolcat + +# whois +(^|[/\w\.]+/)whois\s? +conf.whois + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/grc.fish new/grc-1.11.3/grc.fish --- old/grc-1.11.1/grc.fish 2017-05-21 16:46:51.000000000 +0200 +++ new/grc-1.11.3/grc.fish 2018-04-29 16:12:55.000000000 +0200 @@ -10,13 +10,17 @@ make mount mtr netstat ping ps tail traceroute \ wdiff blkid du dnf docker docker-machine env id ip iostat \ last lsattr lsblk lspci lsmod lsof getfacl getsebool ulimit uptime nmap \ - fdisk findmnt free semanage sar ss sysctl systemctl stat showmount tune2fs \ - tcpdump tune2fs \ - vmstat w who + fdisk findmnt free semanage sar ss sysctl systemctl stat showmount \ + tcpdump tune2fs vmstat w who for executable in $grc_plugin_execs if type -q $executable - alias $executable "grc $executable" + function $executable --inherit-variable executable --wraps=$executable + if isatty 1 + grc $executable $argv + else + eval command $executable $argv + end + end end end - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/grc.zsh new/grc-1.11.3/grc.zsh --- old/grc-1.11.1/grc.zsh 2017-05-21 16:46:51.000000000 +0200 +++ new/grc-1.11.3/grc.zsh 2018-04-29 16:12:55.000000000 +0200 @@ -1,6 +1,4 @@ if [[ "$TERM" != dumb ]] && (( $+commands[grc] )) ; then - # Prevent grc aliases from overriding zsh completions. - setopt COMPLETE_ALIASES # Supported commands cmds=( @@ -26,12 +24,14 @@ traceroute \ traceroute6 \ wdiff \ + whois \ + iwconfig \ ); # Set alias for available commands. for cmd in $cmds ; do if (( $+commands[$cmd] )) ; then - alias $cmd="grc --colour=auto $cmd" + alias $cmd="grc --colour=auto $(whence $cmd)" fi done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/grcat new/grc-1.11.3/grcat --- old/grc-1.11.1/grcat 2017-05-21 16:46:51.000000000 +0200 +++ new/grc-1.11.3/grcat 2018-04-29 16:12:55.000000000 +0200 @@ -135,7 +135,7 @@ continue if not l[0] in letters: break - fields = split(l[:-1], "=", 1) + fields = split(l.rstrip('\r\n'), "=", 1) if len(fields) != 2: sys.stderr.write('Error in configuration, I expect keyword=value line\n') sys.stderr.write('But I got instead:\n') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grc-1.11.1/install.sh new/grc-1.11.3/install.sh --- old/grc-1.11.1/install.sh 2017-05-21 16:46:51.000000000 +0200 +++ new/grc-1.11.3/install.sh 2018-04-29 16:12:55.000000000 +0200 @@ -26,3 +26,9 @@ mkdir -p $PROFILEDIR cp -fv grc.bashrc $PROFILEDIR +# probably we should not install it into site-functions in a debian package... +if [ "$PREFIX" = "/usr/local" ]; then + mkdir -p $PREFIX/zsh/site-functions + cp -fv _grc $PREFIX/zsh/site-functions +fi +
