From 3cf1422eac17a2d6c22151ee918d02db06b32423 Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Fri, 10 Nov 2023 05:08:11 +0100
Subject: [PATCH] TRY TO CORRECT ERROR WITH PYTHON ENV DURING INSTALL

---
 tools/jaklis/jaklis.py        |  2 +-
 tools/jaklis/requirements.txt |  1 +
 tools/jaklis/setup.sh         | 18 ++++++++++--------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/tools/jaklis/jaklis.py b/tools/jaklis/jaklis.py
index 0a13eb26c..3f95b2130 100755
--- a/tools/jaklis/jaklis.py
+++ b/tools/jaklis/jaklis.py
@@ -124,7 +124,7 @@ def createTmpDunikey():
 
     key = SigningKey.from_credentials(getpass.getpass("Identifiant: "), getpass.getpass("Mot de passe: "), None)
     key.save_pubsec_file(keyPath)
-    
+
     return keyPath
 
 # Check if we need dunikey
diff --git a/tools/jaklis/requirements.txt b/tools/jaklis/requirements.txt
index 67be2607d..42eb12b3c 100755
--- a/tools/jaklis/requirements.txt
+++ b/tools/jaklis/requirements.txt
@@ -7,3 +7,4 @@ python-dotenv
 gql==3.0.0a5
 #gql==2.0
 requests
+websockets==10.0
diff --git a/tools/jaklis/setup.sh b/tools/jaklis/setup.sh
index 222e4ba9a..b50a2225d 100755
--- a/tools/jaklis/setup.sh
+++ b/tools/jaklis/setup.sh
@@ -1,12 +1,14 @@
 #!/bin/bash
 
-for i in gcc python3-pip python3-setuptools libpq-dev python3-dev python3-wheel; do
-	if [ $(dpkg-query -W -f='${Status}' $i 2>/dev/null | grep -c "ok installed") -eq 0 ]; then
-		[[ ! $j ]] && sudo apt update
-		sudo apt install -y $i
-		j=1
-	fi
+for i in gcc python3-pip python3-setuptools libpq-dev python3-dev python3-wheel python3-duniterpy python3-termcolor  ; do
+    if [ $(dpkg-query -W -f='${Status}' $i 2>/dev/null | grep -c "ok installed") -eq 0 ]; then
+        [[ ! $j ]] && sudo apt update
+        sudo apt install -y $i
+        j=1
+    fi
 done
 
-pip3 install -r requirements.txt
-chmod u+x jaklis.py
+~/.venvs/astro/bin/python -m pip install -r requirements.txt
+
+sed "s~/usr/bin/env python3~$HOME/.venvs/astro/bin/python~g" jaklis.py > ~/.local/bin/
+chmod u+x ~/.local/bin/jaklis.py