mirror
/
cyberpanel
mirror of https://github.com/usmannasir/cyberpanel.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1240 from usmannasir/stable 

stable to current
This commit is contained in:
Usman Nasir 2024-03-26 17:53:02 +05:00 committed by GitHub
parent 9f2c261672 43d32483a8
commit b27c3aabde
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cyberpanel.sh
View File

@ -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
}

15
cyberpanel_upgrade.sh
View File

@ -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