From cfe034e0f96fa629ac6c4660c14d3c811594d66c Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Wed, 17 May 2023 18:04:41 +0200
Subject: [PATCH 1/3] #3845 reset virtual env after poetry installs

---
 home.admin/config.scripts/bonus.lnbits.sh     | 10 ++++++++++
 home.admin/config.scripts/bonus.suez.sh       | 11 +++++++++++
 home.admin/config.scripts/cl-plugin.backup.sh |  6 ++++++
 home.admin/config.scripts/cl.install.sh       |  7 +++++++
 4 files changed, 34 insertions(+)

diff --git a/home.admin/config.scripts/bonus.lnbits.sh b/home.admin/config.scripts/bonus.lnbits.sh
index 3d18c9e88..c1b70ac9f 100644
--- a/home.admin/config.scripts/bonus.lnbits.sh
+++ b/home.admin/config.scripts/bonus.lnbits.sh
@@ -588,6 +588,11 @@ if [ "$1" = "sync" ] || [ "$1" = "repo" ]; then
   # do install like this
   sudo -u lnbits poetry install
 
+  # make sure default virtaulenv is used
+  sudo apt-get remove -y python3-virtualenv 2>/dev/null
+  sudo pip uninstall -y virtualenv 2>/dev/null
+  sudo apt-get install -y python3-virtualenv
+
   # restart lnbits service
   sudo systemctl restart lnbits
   echo "# server is restarting ... maybe takes some seconds until available"
@@ -642,6 +647,11 @@ if [ "$1" = "install" ]; then
   # do install like this
   sudo -u lnbits poetry install
 
+  # make sure default virtaulenv is used
+  sudo apt-get remove -y python3-virtualenv 2>/dev/null
+  sudo pip uninstall -y virtualenv 2>/dev/null
+  sudo apt-get install -y python3-virtualenv
+
   exit 0
 fi
 
diff --git a/home.admin/config.scripts/bonus.suez.sh b/home.admin/config.scripts/bonus.suez.sh
index 011c68e55..e889d8bc3 100644
--- a/home.admin/config.scripts/bonus.suez.sh
+++ b/home.admin/config.scripts/bonus.suez.sh
@@ -45,6 +45,11 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
     "${PGPsigner}" "${PGPpubkeyLink}" "${PGPpubkeyFingerprint}" || exit 1
   sudo -u bitcoin poetry install
 
+  # make sure default virtaulenv is used
+  sudo apt-get remove -y python3-virtualenv 2>/dev/null
+  sudo pip uninstall -y virtualenv 2>/dev/null
+  sudo apt-get install -y python3-virtualenv
+
   # setting value in raspi blitz config
   /home/admin/config.scripts/blitz.conf.sh set suez "on"
 
@@ -86,6 +91,12 @@ if [ "$1" = "update" ]; then
     "${PGPsigner}" "${PGPpubkeyLink}" "${PGPpubkeyFingerprint}" || exit 1
   sudo -u bitcoin poetry install
   echo "# Updated to the latest in https://github.com/prusnak/suez/commits/master"
+
+  # make sure default virtaulenv is used
+  sudo apt-get remove -y python3-virtualenv 2>/dev/null
+  sudo pip uninstall -y virtualenv 2>/dev/null
+  sudo apt-get install -y python3-virtualenv
+
   exit 0
 fi
 
diff --git a/home.admin/config.scripts/cl-plugin.backup.sh b/home.admin/config.scripts/cl-plugin.backup.sh
index 5b3f4b1a7..0a852cf43 100644
--- a/home.admin/config.scripts/cl-plugin.backup.sh
+++ b/home.admin/config.scripts/cl-plugin.backup.sh
@@ -60,6 +60,11 @@ function install() {
   else
     echo "# The ${plugin} plugin is already loaded"
   fi
+
+  # make sure default virtaulenv is used
+  sudo apt-get remove -y python3-virtualenv 2>/dev/null
+  sudo pip uninstall -y virtualenv 2>/dev/null
+  sudo apt-get install -y python3-virtualenv
 }
 
 if [ "$1" = on ]; then
@@ -153,6 +158,7 @@ then
       sudo systemctl start ${netprefix}lightningd
       echo "# Started the ${netprefix}lightningd.service"
     fi
+
   fi
 
 elif
diff --git a/home.admin/config.scripts/cl.install.sh b/home.admin/config.scripts/cl.install.sh
index 250717d91..707df564e 100644
--- a/home.admin/config.scripts/cl.install.sh
+++ b/home.admin/config.scripts/cl.install.sh
@@ -68,6 +68,12 @@ function buildAndInstallCLbinaries() {
   sudo -u bitcoin git reset --hard
   echo "- Install to /usr/local/bin/"
   sudo make install || exit 1
+
+  # make sure default virtaulenv is used
+  sudo apt-get remove -y python3-virtualenv 2>/dev/null
+  sudo pip uninstall -y virtualenv 2>/dev/null
+  sudo apt-get install -y python3-virtualenv
+
 }
 
 echo "# Running: 'cl.install.sh $*'"
@@ -234,6 +240,7 @@ if [ "$1" = on ] || [ "$1" = update ] || [ "$1" = testPR ]; then
     echo "# Building from source Core Lightning $currentCLversion"
 
     buildAndInstallCLbinaries
+
   fi
 
   ##########

From 1b7435c4b7b56f2961a9528f4ee3ccc4f16129e3 Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Fri, 19 May 2023 00:05:28 +0200
Subject: [PATCH 2/3] #3836 retest specter 1.14.5

---
 home.admin/config.scripts/bonus.specter.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home.admin/config.scripts/bonus.specter.sh b/home.admin/config.scripts/bonus.specter.sh
index 415953537..0eab118a7 100755
--- a/home.admin/config.scripts/bonus.specter.sh
+++ b/home.admin/config.scripts/bonus.specter.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # https://github.com/cryptoadvance/specter-desktop
 
-pinnedVersion="1.8.1"
+pinnedVersion="1.14.5"
 
 # command info
 if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then

From 8322bf3cefc6c75513e1358cc78f2c25bd1822fb Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Fri, 19 May 2023 00:40:49 +0200
Subject: [PATCH 3/3] #3836 return specter to 1.8.1

---
 home.admin/config.scripts/bonus.specter.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home.admin/config.scripts/bonus.specter.sh b/home.admin/config.scripts/bonus.specter.sh
index 0eab118a7..415953537 100755
--- a/home.admin/config.scripts/bonus.specter.sh
+++ b/home.admin/config.scripts/bonus.specter.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # https://github.com/cryptoadvance/specter-desktop
 
-pinnedVersion="1.14.5"
+pinnedVersion="1.8.1"
 
 # command info
 if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then