From d85691ebee26891547c208e3e2e34e67b07562d7 Mon Sep 17 00:00:00 2001
From: Nitroretro <nitroretro@protonmail.com>
Date: Tue, 17 Dec 2019 19:45:11 +0200
Subject: calcurse-caldav: use $XDG_{CONFIG,DATA}_HOME
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
---
contrib/caldav/calcurse-caldav.py | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
(limited to 'contrib')
diff --git a/contrib/caldav/calcurse-caldav.py b/contrib/caldav/calcurse-caldav.py
index d247f80..ec8f8fb 100755
--- a/contrib/caldav/calcurse-caldav.py
+++ b/contrib/caldav/calcurse-caldav.py
@@ -519,11 +519,21 @@ def run_hook(name):
nsmap = {"D": "DAV:", "C": "urn:ietf:params:xml:ns:caldav"}
# Initialize default values.
-configfn = os.path.expanduser("~/.calcurse/caldav/config")
-lockfn = os.path.expanduser("~/.calcurse/caldav/lock")
-syncdbfn = os.path.expanduser("~/.calcurse/caldav/sync.db")
-hookdir = os.path.expanduser("~/.calcurse/caldav/hooks/")
-oauth_file = os.path.expanduser("~/.calcurse/caldav/oauth2_cred")
+if os.path.isdir(os.path.expanduser("~/.calcurse")):
+ configfn = os.path.expanduser("~/.calcurse/caldav/config")
+ lockfn = os.path.expanduser("~/.calcurse/caldav/lock")
+ syncdbfn = os.path.expanduser("~/.calcurse/caldav/sync.db")
+ hookdir = os.path.expanduser("~/.calcurse/caldav/hooks/")
+ oauth_file = os.path.expanduser("~/.calcurse/caldav/oauth2_cred")
+else:
+ calcurse_data = os.getenv("XDG_DATA_HOME", os.path.expanduser("~/.local/share")) + "/calcurse"
+ calcurse_config = os.getenv("XDG_CONFIG_HOME", os.path.expanduser("~/.local/share")) + "/calcurse"
+
+ configfn = os.path.expanduser(calcurse_config + "/caldav/config")
+ lockfn = os.path.expanduser(calcurse_data + "/caldav/lock")
+ syncdbfn = os.path.expanduser(calcurse_data + "/caldav/sync.db")
+ hookdir = os.path.expanduser(calcurse_config + "/caldav/hooks/")
+ oauth_file = os.path.expanduser(calcurse_config + "/caldav/oauth2_cred")
# Parse command line arguments.
parser = argparse.ArgumentParser('calcurse-caldav')
--
cgit v1.2.3-70-g09d2