From 6af4e2b0e53d10ebeec90d9e7573191a7fbcacad Mon Sep 17 00:00:00 2001
From: paukstelis <paukstel@umd.edu>
Date: Wed, 26 Jun 2024 17:35:40 -0400
Subject: [PATCH] Python3.11 (#172)

* ubuntu/fedora pin to python3.11 for now

* add dev pacakge
---
 prepare.sh | 12 +++++++++---
 util.sh    |  4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/prepare.sh b/prepare.sh
index a5f8cff..4363c1a 100644
--- a/prepare.sh
+++ b/prepare.sh
@@ -93,6 +93,8 @@ deb_packages() {
     -e python3-venv \
     -e python3.9-venv \
     -e python3.10-venv \
+    -e python3.11-venv \
+    -e python3.11-dev \
     -e virtualenv \
     -e python3-dev \
     -e build-essential \
@@ -272,6 +274,10 @@ new_install() {
     PYVERSION="python3"
     if [ $INSTALL -eq 2 ]; then
         apt-get update > /dev/null
+        PYV=$(python3 -c"import sys; print(sys.version_info.minor)")
+        if [ $PYV -gt 11 ]; then
+            PYVERSION='python3.11'
+        fi
         deb_packages
     fi
     
@@ -286,9 +292,9 @@ new_install() {
         fi
         systemctl enable sshd.service
         PYV=$(python3 -c"import sys; print(sys.version_info.minor)")
-        if [ $PYV -gt 10 ]; then
-            dnf -y install python3.10-devel
-            PYVERSION='python3.10'
+        if [ $PYV -gt 11 ]; then
+            dnf -y install python3.11-devel
+            PYVERSION='python3.11'
         fi
         dnf_packages
     fi
diff --git a/util.sh b/util.sh
index 16c3c35..fab8a25 100644
--- a/util.sh
+++ b/util.sh
@@ -395,8 +395,8 @@ diagnostics() {
         echo "**************************************" | log
         systemctl status $instance -l --no-pager | log
         #get needed config info
-        sudo -u $user $OCTOEXEC --basedir=/home/$user/.$INSTANCE config get plugins.classicwebcam.stream | log
-        sudo -u $user $OCTOEXEC --basedir=/home/$user/.$INSTANCE config get plugins.classicwebcam.snapshot | log
+        sudo -u $user $OCTOEXEC --basedir=/home/$user/.$INSTANCE config get plugins.classicwebcam | log
+        #sudo -u $user $OCTOEXEC --basedir=/home/$user/.$INSTANCE config get plugins.classicwebcam.snapshot | log
         sudo -u $user $OCTOEXEC --basedir=/home/$user/.$INSTANCE config get webcam | log
     done
     #get all cam status