From b8c64830bbbb12679d1cae456a3813b7985056e6 Mon Sep 17 00:00:00 2001 From: Ben Peddell Date: Sun, 13 Nov 2016 10:05:46 +1000 Subject: [PATCH] Don't load user-instance if older than global-instance Too many people have performed a user-install and then opened a ticket wondering why their settings in /etc/arkmanager/instances/main.cfg won't apply. Avoid this by not loading the instance.cfg in ~/.config/arkmanager/instances if it's older than the instance.cfg in /etc/arkmanager/instances --- tools/arkmanager | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/arkmanager b/tools/arkmanager index 2742f7a..42672a2 100755 --- a/tools/arkmanager +++ b/tools/arkmanager @@ -2585,7 +2585,7 @@ useConfig() { if [ -f "/etc/arkmanager/instances/${1}.cfg" ]; then configfile="/etc/arkmanager/instances/${1}.cfg" fi - if [ -f "${HOME}/.config/arkmanager/instances/${1}.cfg" ]; then + if [[ -f "${HOME}/.config/arkmanager/instances/${1}.cfg" && "${HOME}/.config/arkmanager/instances/${1}.cfg" -nt "/etc/arkmanager/instances/${1}.cfg" ]]; then configfile="${HOME}/.config/arkmanager/instances/${1}.cfg" fi for varname in "${!configfile_@}"; do