From 037d4d0f6504a365ff55b69d97834f41a2aa7baa Mon Sep 17 00:00:00 2001
From: zawz <zawz@hotmail.fr>
Date: Fri, 30 Apr 2021 15:12:08 +0200
Subject: [PATCH] fix wrong datapath autoset before file config

---
 src/config.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/config.sh b/src/config.sh
index 2828118..bf17728 100644
--- a/src/config.sh
+++ b/src/config.sh
@@ -7,7 +7,6 @@ configpath="$HOME/.config/zpass"
 [ -n "$XDG_CONFIG_HOME" ] && configpath="$XDG_CONFIG_HOME/zpass"
 [ -n "$XDG_CACHE_HOME" ] && cachepath="$XDG_CACHE_HOME/zpass"
 [ -z "$CONFIGFILE" ] && CONFIGFILE="$configpath/default.conf"
-[ -n "$XDG_DATA_HOME" ] && [ -z "$ZPASS_REMOTE_ADDR" ] && datapath="$XDG_DATA_HOME/zpass"
 
 [ -z "$TMPDIR" ] && TMPDIR=/tmp
 
@@ -18,6 +17,8 @@ env | grep '^ZPASS_.*=' | sed "s/'/'\\\''/g;s/=/='/;s/$/'/g" > "$tmpenv"
 # load config file
 [ -f "$CONFIGFILE" ] && { . "$CONFIGFILE" || exit $? ; }
 
+[ -n "$XDG_DATA_HOME" ] && [ -z "$ZPASS_REMOTE_ADDR" ] && datapath="$XDG_DATA_HOME/zpass"
+
 . "$tmpenv" || exit $?
 rm -f "$tmpenv" 2>/dev/null