Merge branch 'v2.0.5-dev' into qtwrkdev

This commit is contained in:
Usman Nasir
2021-03-09 22:50:05 +05:00
committed by GitHub
105 changed files with 10745 additions and 9084 deletions

View File

@@ -4,6 +4,7 @@
#set -x
#set -u
#CyberPanel installer script for CentOS 7.X, CentOS 8.X, CloudLinux 7.X, Ubuntu 18.04 and Ubuntu 20.04
#For whoever may edit this script, please follow :
#Please use Pre_Install_xxx() and Post_Install_xxx() if you want to something respectively before or after the panel installation
@@ -1229,7 +1230,6 @@ Retry_Command "/root/.acme.sh/acme.sh --upgrade --auto-upgrade"
#install acme and upgrade it beforehand, to prevent gitee fail
}
Main_Installation() {
Debug_Log2 "Start to main installation..."
if [[ -d /usr/local/CyberCP ]] ; then
@@ -1822,4 +1822,4 @@ Post_Install_Setup_Utility
Post_Install_Tweak
Post_Install_Display_Final_Info
Post_Install_Display_Final_Info