Robot
/
bash-color-grc
mirror of https://github.com/garabik/grc.git
2
0
Fork 0
Code Issues Releases Wiki Activity

Change configuration order to sytem-then-user 

If the user creates a user-specific configuration the system-wide
configuration stops working.

This PR changes the order to system-then-user.
The latest found takes precedence.
This commit is contained in:
Rostyslav Polishchuk 2020-05-29 18:06:13 -07:00
parent c910742ee6
commit fba1ba22b5
No known key found for this signature in database
GPG Key ID: D27A7BA2ACD3FCA9
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
grc
View File

@ -81,38 +81,33 @@ if stdoutf == 1:
if use_pty:
import pty
conffile = None
if cfile == "":
home = os.environ.get('HOME')
xdg = os.environ.get('XDG_CONFIG_HOME')
if not xdg and home:
xdg = home + '/.config'
conffilenames = []
conffilenames = ['/etc/grc.conf', '/usr/local/etc/grc.conf']
if xdg:
conffilenames += [xdg + '/grc/grc.conf']
if home:
conffilenames += [home + '/.grc/grc.conf']
conffilenames += ['/usr/local/etc/grc.conf', '/etc/grc.conf']
for i in conffilenames:
# test if conffile exists, it can be also a pipe
if os.path.exists(i) and not os.path.isdir(i):
conffile = i
break
regexplist = []
if conffile:
f = open(conffile, "r")
while 1:
l = f.readline()
if l == "":
break
if l[0] == "#" or l[0] == '\012':
continue
regexp = l.strip()
if re.search(regexp, ' '.join(args)):
cfile = f.readline().strip()
break
for conffile in conffilenames:
# test if conffile exists, it can be also a pipe
if os.path.exists(conffile) and not os.path.isdir(conffile):
f = open(conffile, "r")
while 1:
l = f.readline()
if l == "":
break
if l[0] == "#" or l[0] == '\012':
continue
regexp = l.strip()
if re.search(regexp, ' '.join(args)):
cfile = f.readline().strip()
break
signal.signal(signal.SIGINT, catch_signal)