From 001ee123847ebca34cf2aa89fddabfb3edea1cd9 Mon Sep 17 00:00:00 2001
From: Stefan Pejcic <stefan@pejcic.rs>
Date: Mon, 5 Feb 2024 21:11:16 +0100
Subject: [PATCH 1/3] Update cyberpanel.sh

Adding OpenPanel on Check_Panel()
---
 cyberpanel.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cyberpanel.sh b/cyberpanel.sh
index 51bac4176..d53a894ce 100644
--- a/cyberpanel.sh
+++ b/cyberpanel.sh
@@ -349,6 +349,10 @@ elif [[ -d /etc/httpd/conf/plesk.conf.d/ ]] || [[ -d /etc/apache2/plesk.conf.d/
   echo -e "\nPlesk detected...\n"
   Debug_Log2 "Plesk detected...exit... [404]"
   exit
+elif [[ -d /usr/local/panel/ ]]; then
+  echo -e "\nOpenPanel detected...\n"
+  Debug_Log2 "OpenPanel detected...exit... [404]"
+  exit
 fi
 }
 

From dabe7c68246b9e49ac0665e75fd75f91b4031d8f Mon Sep 17 00:00:00 2001
From: Gergely Lonyai <gergely@lonyai.com>
Date: Thu, 8 Feb 2024 14:34:42 +0100
Subject: [PATCH 2/3] Fix pip3.6 on CentOS

---
 cyberpanel_upgrade.sh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/cyberpanel_upgrade.sh b/cyberpanel_upgrade.sh
index ae2720ae1..ae11c541e 100644
--- a/cyberpanel_upgrade.sh
+++ b/cyberpanel_upgrade.sh
@@ -495,8 +495,13 @@ if [ "$Server_OS" = "Ubuntu" ]; then
   pip3 install --default-timeout=3600 virtualenv==16.7.9
     Check_Return
 else
-  pip3.6 install --default-timeout=3600 virtualenv==16.7.9
-    Check_Return
+  if [ -e /usr/bin/pip3 ]; then
+    $PIP3="/usr/bin/pip3"
+  else
+    $PIP3="pip3.6"
+  fi
+  $PIP3 install --default-timeout=3600 virtualenv==16.7.9
+  Check_Return
 fi
 
 if [[ -f /usr/local/CyberPanel/bin/python2 ]]; then
@@ -518,9 +523,9 @@ fi
 Download_Requirement
 
 if [[ "$Server_OS" = "CentOS" ]] ; then
-  pip3.6 install --default-timeout=3600 virtualenv==16.7.9
+  $PIP3 install --default-timeout=3600 virtualenv==16.7.9
     Check_Return
-  pip3.6 install --default-timeout=3600 --ignore-installed -r /usr/local/requirments.txt
+  $PIP3 install --default-timeout=3600 --ignore-installed -r /usr/local/requirments.txt
     Check_Return
 elif [[ "$Server_OS" = "Ubuntu" ]] ; then
   # shellcheck disable=SC1091
@@ -613,7 +618,7 @@ else
   # shellcheck disable=SC1091
   source /usr/local/CyberCP/bin/activate
     Check_Return
-  pip3.6 install --default-timeout=3600 --ignore-installed -r /usr/local/requirments.txt
+  $PIP3 install --default-timeout=3600 --ignore-installed -r /usr/local/requirments.txt
     Check_Return
 fi
 

From b75b4919af9d5661e761836767a8ac59389a891d Mon Sep 17 00:00:00 2001
From: Gergely Lonyai <gergely@lonyai.com>
Date: Thu, 8 Feb 2024 14:40:55 +0100
Subject: [PATCH 3/3] Update cyberpanel_upgrade.sh

---
 cyberpanel_upgrade.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cyberpanel_upgrade.sh b/cyberpanel_upgrade.sh
index ae11c541e..702b61e57 100644
--- a/cyberpanel_upgrade.sh
+++ b/cyberpanel_upgrade.sh
@@ -496,9 +496,9 @@ if [ "$Server_OS" = "Ubuntu" ]; then
     Check_Return
 else
   if [ -e /usr/bin/pip3 ]; then
-    $PIP3="/usr/bin/pip3"
+    PIP3="/usr/bin/pip3"
   else
-    $PIP3="pip3.6"
+    PIP3="pip3.6"
   fi
   $PIP3 install --default-timeout=3600 virtualenv==16.7.9
   Check_Return