From 711893b7df673129850a3d80025547c48f47f177 Mon Sep 17 00:00:00 2001
From: absurdo <antonio.delarosa@salirdelhoyo.com>
Date: Fri, 23 Jun 2023 01:12:01 +0200
Subject: [PATCH] Fixes in scripts for debian 12

---
 scripts/system/install_psutil.sh     |  2 +-
 scripts/system/install_python.sh     | 14 +++++++++++---
 scripts/system/install_pzoo_stats.py |  2 +-
 scripts/system/install_unixutils.sh  |  4 ++--
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/scripts/system/install_psutil.sh b/scripts/system/install_psutil.sh
index 5742b32..030c6aa 100644
--- a/scripts/system/install_psutil.sh
+++ b/scripts/system/install_psutil.sh
@@ -6,7 +6,7 @@ sleep 1
 
 echo '{"error": 0, "status": 0, "progress": 100, "no_progress":0, "message": "Installing python3-psutil..."}'
 
-sudo pip3 install psutil
+sudo /opt/pythonenv/bin/pip3 install psutil
 #sudo apt-get install -y python3-psutil
 
 #echo "Installed python3-psutil sucessfully if not error..."
diff --git a/scripts/system/install_python.sh b/scripts/system/install_python.sh
index 23fb890..a3993c5 100644
--- a/scripts/system/install_python.sh
+++ b/scripts/system/install_python.sh
@@ -22,7 +22,7 @@ elif [[ $DISTRO =~ ^NAME=\"Arch ]]; then
 
     sudo pacman -S --noconfirm python python-pip sudo augeas python-virtualenv
 
-elif [[ $DISTRO =~ ^NAME=\"Rocky ]];  then
+elif [[ $DISTRO =~ ^NAME=\"Rocky ]] || [[ $DISTRO =~ ^NAME=\"Alma ]];  then
 
     dnf install -y sudo
     
@@ -68,10 +68,18 @@ fi
 
 echo '{"error": 0, "status": 0, "progress": 0, "no_progress":0, "message": "Installing distro package for python and detect distribution..."}'
 
+# Install virtualenv python and give source in profile.
+
+sudo python3 -m venv /opt/pythonenv/
+
+sudo /opt/pythonenv/bin/pip install --upgrade pip
+
+echo "export PS_REAL=\$PS1 && source /opt/pythonenv/bin/activate && export PS1=\$PS_REAL" >> /etc/profile.d/zpythonenv.sh
+
 sleep 1
 
-sudo pip3 install distro
-
+sudo /opt/pythonenv/bin/pip3 install distro
+    
 if [ $? -eq 0 ]; then
 
     #echo "Installed python3 sucessfully if not error..."
diff --git a/scripts/system/install_pzoo_stats.py b/scripts/system/install_pzoo_stats.py
index 239e7b9..a17c7d6 100644
--- a/scripts/system/install_pzoo_stats.py
+++ b/scripts/system/install_pzoo_stats.py
@@ -139,7 +139,7 @@ if check_url.match(args.url_stats):
 
     os.chmod('/etc/cron.daily/get_updates.py', 0o700)
     """
-    if call("sudo pip3 install --upgrade git+https://bitbucket.org/paramecio/pastafaristats", shell=True)>0:
+    if call("sudo /opt/pythonenv/bin/pip3 install --upgrade git+https://bitbucket.org/paramecio/pastafaristats", shell=True)>0:
         print('Error, cannot install pastafari stats')
         exit(1)
     else:
diff --git a/scripts/system/install_unixutils.sh b/scripts/system/install_unixutils.sh
index 85a501a..5aa22cf 100644
--- a/scripts/system/install_unixutils.sh
+++ b/scripts/system/install_unixutils.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
 # Install unix tools repo.
 
-sudo pip3 install git+https://bitbucket.org/paramecio/pastafariutils
+sudo /opt/pythonenv/bin/pip3 install git+https://bitbucket.org/paramecio/pastafariutils