From f39be0e03bdd3c2376e4bf24d1adcb9ae5721503 Mon Sep 17 00:00:00 2001
From: poka <poka@p2p.legal>
Date: Wed, 2 Dec 2020 07:36:19 +0100
Subject: [PATCH] Improve dunikey path loading

---
 cesium-profile.py  |  6 ++++++
 dialog.py          | 10 +++++++---
 gchange-profile.py |  6 ++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/cesium-profile.py b/cesium-profile.py
index f7e276c..b59467e 100755
--- a/cesium-profile.py
+++ b/cesium-profile.py
@@ -19,6 +19,12 @@ pod = os.getenv('POD')
 if not dunikey or not pod:
     sys.stderr.write("Please fill the path of your private key (PubSec), and a Cesium ES address in .env file\n")
     sys.exit(1)
+if not os.path.isfile(dunikey):
+    HOME = os.getenv("HOME")
+    dunikey = HOME + os.getenv('DUNIKEY')
+if not os.path.isfile(dunikey):
+    sys.stderr.write("File {0} doesn't exist.\n".format(dunikey))
+    sys.exit(1)
 
 # Parse arguments
 parser = argparse.ArgumentParser()
diff --git a/dialog.py b/dialog.py
index 18daf51..34f3a11 100755
--- a/dialog.py
+++ b/dialog.py
@@ -9,18 +9,22 @@ from lib.cesium import ReadFromCesium, SendToCesium, DeleteFromCesium
 VERSION = "0.1.1"
 
 # Get variables environment
-HOME = os.getenv("HOME")
 if not os.path.isfile('.env'):
     copyfile(".env.template", ".env")
 dotenv_path = join(dirname(__file__), '.env')
 load_dotenv(dotenv_path)
 
-dunikey = HOME + os.getenv('DUNIKEY')
+dunikey = os.getenv('DUNIKEY')
 pod = os.getenv('POD')
 if not dunikey or not pod:
     sys.stderr.write("Please fill the path of your private key (PubSec), and a Cesium ES address in .env file\n")
     sys.exit(1)
-
+if not os.path.isfile(dunikey):
+    HOME = os.getenv("HOME")
+    dunikey = HOME + os.getenv('DUNIKEY')
+if not os.path.isfile(dunikey):
+    sys.stderr.write("File {0} doesn't exist.\n".format(dunikey))
+    sys.exit(1)
 
 # Parse arguments
 parser = argparse.ArgumentParser()
diff --git a/gchange-profile.py b/gchange-profile.py
index e66c4a3..e3b0401 100755
--- a/gchange-profile.py
+++ b/gchange-profile.py
@@ -17,6 +17,12 @@ pod = os.getenv('POD')
 if not dunikey or not pod:
     sys.stderr.write("Please fill the path of your private key (PubSec), and a Cesium ES address in .env file\n")
     sys.exit(1)
+if not os.path.isfile(dunikey):
+    HOME = os.getenv("HOME")
+    dunikey = HOME + os.getenv('DUNIKEY')
+if not os.path.isfile(dunikey):
+    sys.stderr.write("File {0} doesn't exist.\n".format(dunikey))
+    sys.exit(1)
 
 
 # Parse arguments