diff --git a/install/installCyberPanel.py b/install/installCyberPanel.py index e689ea660..e4fae3f19 100755 --- a/install/installCyberPanel.py +++ b/install/installCyberPanel.py @@ -188,18 +188,11 @@ class InstallCyberPanel: 'lsphp7?-ldap lsphp7?-mysql lsphp7?-opcache lsphp7?-pspell lsphp7?-recode ' \ 'lsphp7?-sqlite3 lsphp7?-tidy' - res = os.system(command) - if res != 0: - InstallCyberPanel.stdOut("Failed to install PHP on Ubuntu.", 1, 1) + os.system(command) - command = 'DEBIAN_FRONTEND=noninteractive apt-get -y install ' \ - 'lsphp8? lsphp8?-common lsphp8?-curl lsphp8?-dev lsphp8?-imap lsphp8?-intl lsphp8?-json ' \ - 'lsphp8?-ldap lsphp8?-mysql lsphp8?-opcache lsphp8?-pspell lsphp8?-recode ' \ - 'lsphp8?-sqlite8 lsphp8?-tidy' + command = 'DEBIAN_FRONTEND=noninteractive apt-get -y install lsphp80*' + os.system(command) - res = os.system(command) - if res != 0: - InstallCyberPanel.stdOut("Failed to install PHP on Ubuntu.", 0, 1) elif self.distro == centos: command = 'yum -y groupinstall lsphp-all' diff --git a/plogical/upgrade.py b/plogical/upgrade.py index 6fb7526e6..9ff26da23 100755 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -1949,12 +1949,8 @@ echo $oConfig->Save() ? 'Done' : 'Error'; 'lsphp7?-sqlite3 lsphp7?-tidy' Upgrade.executioner(command, 'Install PHP 73, 0') - command = 'DEBIAN_FRONTEND=noninteractive apt-get -y install ' \ - 'lsphp8? lsphp8?-common lsphp8?-curl lsphp8?-dev lsphp8?-imap lsphp8?-intl lsphp8?-json ' \ - 'lsphp8?-ldap lsphp8?-mysql lsphp8?-opcache lsphp8?-pspell lsphp8?-recode ' \ - 'lsphp8?-sqlite8 lsphp8?-tidy' - - Upgrade.executioner(command, 'Install PHP 80, 0') + command = 'DEBIAN_FRONTEND=noninteractive apt-get -y install lsphp80*' + os.system(command) CentOSPath = '/etc/redhat-release'