From 036e65470e75ad66cc2f58d9ac2b89a05f1d8591 Mon Sep 17 00:00:00 2001
From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com>
Date: Mon, 24 Jun 2024 10:46:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=20PHP8=20=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85=20xmlrpc=20=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20(#1618)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/php8/8.0.30/build/php/extensions/install.sh | 11 +++++------
 apps/php8/8.1.29/build/php/extensions/install.sh | 11 +++++------
 apps/php8/8.2.20/build/php/extensions/install.sh | 11 +++++------
 apps/php8/8.3.8/build/php/extensions/install.sh  | 11 +++++------
 4 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/apps/php8/8.0.30/build/php/extensions/install.sh b/apps/php8/8.0.30/build/php/extensions/install.sh
index bbca7095..91b5ff3a 100644
--- a/apps/php8/8.0.30/build/php/extensions/install.sh
+++ b/apps/php8/8.0.30/build/php/extensions/install.sh
@@ -92,6 +92,11 @@ if [[ -z "${EXTENSIONS##*,ssh2,*}" ]]; then
     echo "---------- Install ssh2 ----------"
 	  install-php-extensions ssh2
 fi
+
+if [[ -z "${EXTENSIONS##*,xmlrpc,*}" ]]; then
+    echo "---------- Install xmlrpc ----------"
+		install-php-extensions xmlrpc
+fi
 # end
 
 
@@ -289,12 +294,6 @@ if [[ -z "${EXTENSIONS##*,xsl,*}" ]]; then
 	docker-php-ext-install ${MC} xsl
 fi
 
-if [[ -z "${EXTENSIONS##*,xmlrpc,*}" ]]; then
-    echo "---------- Install xmlrpc ----------"
-	apk add --no-cache libxml2-dev libxslt-dev
-	docker-php-ext-install ${MC} xmlrpc
-fi
-
 if [[ -z "${EXTENSIONS##*,wddx,*}" ]]; then
     echo "---------- Install wddx ----------"
 	apk add --no-cache libxml2-dev libxslt-dev
diff --git a/apps/php8/8.1.29/build/php/extensions/install.sh b/apps/php8/8.1.29/build/php/extensions/install.sh
index bbca7095..91b5ff3a 100644
--- a/apps/php8/8.1.29/build/php/extensions/install.sh
+++ b/apps/php8/8.1.29/build/php/extensions/install.sh
@@ -92,6 +92,11 @@ if [[ -z "${EXTENSIONS##*,ssh2,*}" ]]; then
     echo "---------- Install ssh2 ----------"
 	  install-php-extensions ssh2
 fi
+
+if [[ -z "${EXTENSIONS##*,xmlrpc,*}" ]]; then
+    echo "---------- Install xmlrpc ----------"
+		install-php-extensions xmlrpc
+fi
 # end
 
 
@@ -289,12 +294,6 @@ if [[ -z "${EXTENSIONS##*,xsl,*}" ]]; then
 	docker-php-ext-install ${MC} xsl
 fi
 
-if [[ -z "${EXTENSIONS##*,xmlrpc,*}" ]]; then
-    echo "---------- Install xmlrpc ----------"
-	apk add --no-cache libxml2-dev libxslt-dev
-	docker-php-ext-install ${MC} xmlrpc
-fi
-
 if [[ -z "${EXTENSIONS##*,wddx,*}" ]]; then
     echo "---------- Install wddx ----------"
 	apk add --no-cache libxml2-dev libxslt-dev
diff --git a/apps/php8/8.2.20/build/php/extensions/install.sh b/apps/php8/8.2.20/build/php/extensions/install.sh
index bbca7095..91b5ff3a 100644
--- a/apps/php8/8.2.20/build/php/extensions/install.sh
+++ b/apps/php8/8.2.20/build/php/extensions/install.sh
@@ -92,6 +92,11 @@ if [[ -z "${EXTENSIONS##*,ssh2,*}" ]]; then
     echo "---------- Install ssh2 ----------"
 	  install-php-extensions ssh2
 fi
+
+if [[ -z "${EXTENSIONS##*,xmlrpc,*}" ]]; then
+    echo "---------- Install xmlrpc ----------"
+		install-php-extensions xmlrpc
+fi
 # end
 
 
@@ -289,12 +294,6 @@ if [[ -z "${EXTENSIONS##*,xsl,*}" ]]; then
 	docker-php-ext-install ${MC} xsl
 fi
 
-if [[ -z "${EXTENSIONS##*,xmlrpc,*}" ]]; then
-    echo "---------- Install xmlrpc ----------"
-	apk add --no-cache libxml2-dev libxslt-dev
-	docker-php-ext-install ${MC} xmlrpc
-fi
-
 if [[ -z "${EXTENSIONS##*,wddx,*}" ]]; then
     echo "---------- Install wddx ----------"
 	apk add --no-cache libxml2-dev libxslt-dev
diff --git a/apps/php8/8.3.8/build/php/extensions/install.sh b/apps/php8/8.3.8/build/php/extensions/install.sh
index bbca7095..91b5ff3a 100644
--- a/apps/php8/8.3.8/build/php/extensions/install.sh
+++ b/apps/php8/8.3.8/build/php/extensions/install.sh
@@ -92,6 +92,11 @@ if [[ -z "${EXTENSIONS##*,ssh2,*}" ]]; then
     echo "---------- Install ssh2 ----------"
 	  install-php-extensions ssh2
 fi
+
+if [[ -z "${EXTENSIONS##*,xmlrpc,*}" ]]; then
+    echo "---------- Install xmlrpc ----------"
+		install-php-extensions xmlrpc
+fi
 # end
 
 
@@ -289,12 +294,6 @@ if [[ -z "${EXTENSIONS##*,xsl,*}" ]]; then
 	docker-php-ext-install ${MC} xsl
 fi
 
-if [[ -z "${EXTENSIONS##*,xmlrpc,*}" ]]; then
-    echo "---------- Install xmlrpc ----------"
-	apk add --no-cache libxml2-dev libxslt-dev
-	docker-php-ext-install ${MC} xmlrpc
-fi
-
 if [[ -z "${EXTENSIONS##*,wddx,*}" ]]; then
     echo "---------- Install wddx ----------"
 	apk add --no-cache libxml2-dev libxslt-dev