From 5f903b7dd3c33cebf69c90cae8d3e9e5088df49a Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Tue, 19 Dec 2023 11:51:44 +0100
Subject: [PATCH] NO VENV

---
 install.sh            | 20 ++++++++++----------
 tools/jaklis/setup.sh |  7 +++++--
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/install.sh b/install.sh
index 6592f668..07145536 100755
--- a/install.sh
+++ b/install.sh
@@ -131,19 +131,19 @@ echo "########################### ♥BOX"
 sudo ln -f -s  /usr/bin/python3 /usr/bin/python
 echo 'export PATH=$PATH:$HOME/.local/bin' >> ~/.bashrc && source ~/.bashrc; echo "<<< CHECK YOUR >>> PATH=$PATH"
 
-mkdir -p ~/.venvs
-python3 -m venv ~/.venvs/astro
+#~ mkdir -p ~/.venvs
+#~ python3 -m venv ~/.venvs/astro
 
-# ~/.venvs/astro/bin/python -m pip install -U pip
-# ~/.venvs/astro/bin/python -m pip install -U setuptools wheel
-# ~/.venvs/astro/bin/python -m pip install -U cryptography Ed25519 base58 google duniterpy pynacl pgpy pynentry SecureBytes
-# ~/.venvs/astro/bin/python -m pip install -U silkaj
-# ~/.venvs/astro/bin/python -m pip install -U protobuf==3.19.0
+# python -m pip install -U pip
+# python -m pip install -U setuptools wheel
+# python -m pip install -U cryptography Ed25519 base58 google duniterpy pynacl pgpy pynentry SecureBytes
+# python -m pip install -U silkaj
+# python -m pip install -U protobuf==3.19.0
 
 for i in pip setuptools wheel cryptography==3.4.8 Ed25519 base58 google duniterpy pynacl pgpy pynentry SecureBytes amzqr pdf2docx pyppeteer; do
         echo ">>> Installation $i <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
-        ~/.venvs/astro/bin/python -m pip install -U $i
-        [[ $? != 0 ]] && echo "INSTALL $i FAILED." && echo "~/.venvs/astro/bin/python -m pip install -U $i FAILED." >> /tmp/install.errors.log && continue
+        python -m pip install -U $i
+        [[ $? != 0 ]] && echo "INSTALL $i FAILED." && echo "python -m pip install -U $i FAILED." >> /tmp/install.errors.log && continue
 done
 
 echo "#############################################"
@@ -157,7 +157,7 @@ if [[ $USER != 'xbian' ]]; then
     if [[ $saisie != "" ]]; then
         ## PRINT & FONTS
         sudo apt install ttf-mscorefonts-installer printer-driver-all cups -y
-        ~/.venvs/astro/bin/python -m pip install brother_ql
+        python -m pip install brother_ql
         sudo cupsctl --remote-admin
         sudo usermod -aG lpadmin $USER
         sudo usermod -a -G tty $USER
diff --git a/tools/jaklis/setup.sh b/tools/jaklis/setup.sh
index 8473add2..6caec3a7 100755
--- a/tools/jaklis/setup.sh
+++ b/tools/jaklis/setup.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+MY_PATH="`dirname \"$0\"`"              # relative
+MY_PATH="`( cd \"$MY_PATH\" && pwd )`"  # absolutized and normalized
 
 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
@@ -8,7 +10,8 @@ for i in gcc python3-pip python3-setuptools libpq-dev python3-dev python3-wheel
     fi
 done
 
-~/.venvs/astro/bin/python -m pip install -r requirements.txt
+python -m pip install -r requirements.txt
 
-sed "s~/usr/bin/env python3~$HOME/.venvs/astro/bin/python~g" jaklis.py > ~/.local/bin/jaklis.py
+mkdir -p ~/.local/bin/
+cp ${MY_PATH}/jaklis.py > ~/.local/bin/jaklis.py
 chmod u+x ~/.local/bin/jaklis.py