From 5cd6e34ef03efa420e75bf0887ad781e4cfc6f2b Mon Sep 17 00:00:00 2001 From: qtwrk Date: Thu, 30 Jan 2020 19:16:32 +0100 Subject: [PATCH] minor fix on lsphp74-zip --- cyberpanel.sh | 4 ++++ cyberpanel_upgrade.sh | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/cyberpanel.sh b/cyberpanel.sh index 7cfdae467..59f567bc2 100644 --- a/cyberpanel.sh +++ b/cyberpanel.sh @@ -1285,6 +1285,10 @@ watchdog_setup install_utility if [[ ! -f /usr/local/lsws/lsphp74/lib64/php/modules/zip.so ]] && [[ $SERVER_OS == "CentOS" ]] && [[ $CENTOS_8 == "False" ]]; then + yum list installed libzip-devel + if [[ $? == "0" ]] ; then + yum remove -y libzip-devel + fi yum install -y http://packages.psychotic.ninja/7/plus/x86_64/RPMS/libzip-0.11.2-6.el7.psychotic.x86_64.rpm yum install -y http://packages.psychotic.ninja/7/plus/x86_64/RPMS/libzip-devel-0.11.2-6.el7.psychotic.x86_64.rpm /usr/local/lsws/lsphp74/bin/pecl install zip diff --git a/cyberpanel_upgrade.sh b/cyberpanel_upgrade.sh index 60466074f..b1475d4b5 100644 --- a/cyberpanel_upgrade.sh +++ b/cyberpanel_upgrade.sh @@ -166,6 +166,10 @@ fi install_utility if [[ ! -f /usr/local/lsws/lsphp74/lib64/php/modules/zip.so ]] && [[ $SERVER_OS == "CentOS7" ]] ; then + yum list installed libzip-devel + if [[ $? == "0" ]] ; then + yum remove -y libzip-devel + fi yum install -y http://packages.psychotic.ninja/7/plus/x86_64/RPMS/libzip-0.11.2-6.el7.psychotic.x86_64.rpm yum install -y http://packages.psychotic.ninja/7/plus/x86_64/RPMS/libzip-devel-0.11.2-6.el7.psychotic.x86_64.rpm /usr/local/lsws/lsphp74/bin/pecl install zip