From 76fb73f46c1a971106605e96423b5f19edc73aef Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Fri, 30 Sep 2022 20:37:46 +0200 Subject: [PATCH] Updated configuration path defaults --- RNS/Reticulum.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/RNS/Reticulum.py b/RNS/Reticulum.py index 27a939a..c0d3995 100755 --- a/RNS/Reticulum.py +++ b/RNS/Reticulum.py @@ -178,10 +178,12 @@ class Reticulum: if configdir != None: Reticulum.configdir = configdir else: - if os.path.isdir(Reticulum.userdir+"/.reticulum") and os.path.isfile(Reticulum.userdir+"/.reticulum/config"): - Reticulum.configdir = Reticulum.userdir+"/.reticulum" - else: + if os.path.isdir(Reticulum.userdir+"/etc/reticulum") and os.path.isfile(Reticulum.userdir+"/etc/reticulum/config"): + Reticulum.configdir = Reticulum.userdir+"/etc/reticulum" + elif os.path.isdir(Reticulum.userdir+"/.config/reticulum") and os.path.isfile(Reticulum.userdir+"/.config/reticulum/config"): Reticulum.configdir = Reticulum.userdir+"/.config/reticulum" + else: + Reticulum.configdir = Reticulum.userdir+"/.reticulum" if logdest == RNS.LOG_FILE: RNS.logdest = RNS.LOG_FILE