From 93bc220600ed733194f83a03da9e5429b4294e39 Mon Sep 17 00:00:00 2001
From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com>
Date: Mon, 23 Sep 2024 13:32:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=20PHP=20=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85=20=20oci8=20=E6=89=A9=E5=B1=95=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20(#2153)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/php7/7.0.33/build/php/extensions/install.sh | 10 +++++-----
 apps/php7/7.1.33/build/php/extensions/install.sh | 10 +++++-----
 apps/php7/7.2.34/build/php/extensions/install.sh | 10 +++++-----
 apps/php7/7.3.33/build/php/extensions/install.sh | 10 +++++-----
 apps/php7/7.4.33/build/php/extensions/install.sh | 10 +++++-----
 apps/php8/8.0.30/build/php/extensions/install.sh | 10 +++++-----
 apps/php8/8.1.29/build/php/extensions/install.sh | 10 +++++-----
 apps/php8/8.2.20/build/php/extensions/install.sh | 10 +++++-----
 apps/php8/8.3.8/build/php/extensions/install.sh  | 10 +++++-----
 9 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/apps/php7/7.0.33/build/php/extensions/install.sh b/apps/php7/7.0.33/build/php/extensions/install.sh
index 6eff2a96..2a68096e 100644
--- a/apps/php7/7.0.33/build/php/extensions/install.sh
+++ b/apps/php7/7.0.33/build/php/extensions/install.sh
@@ -124,6 +124,11 @@ if [[ -z "${EXTENSIONS##*,pdo_oci,*}" ]]; then
     echo "---------- Install pdo_oci ----------"
 	 install-php-extensions  pdo_oci
 fi
+
+if [[ -z "${EXTENSIONS##*,oci8,*}" ]]; then
+    echo "---------- Install oci8 ----------"
+   install-php-extensions oci8
+fi
 # end
 
 
@@ -230,11 +235,6 @@ if [[ -z "${EXTENSIONS##*,pgsql,*}" ]]; then
     && docker-php-ext-install ${MC} pgsql
 fi
 
-if [[ -z "${EXTENSIONS##*,oci8,*}" ]]; then
-    echo "---------- Install oci8 ----------"
-	docker-php-ext-install ${MC} oci8
-fi
-
 if [[ -z "${EXTENSIONS##*,odbc,*}" ]]; then
     echo "---------- Install odbc ----------"
 	docker-php-ext-install ${MC} odbc
diff --git a/apps/php7/7.1.33/build/php/extensions/install.sh b/apps/php7/7.1.33/build/php/extensions/install.sh
index 6eff2a96..2a68096e 100644
--- a/apps/php7/7.1.33/build/php/extensions/install.sh
+++ b/apps/php7/7.1.33/build/php/extensions/install.sh
@@ -124,6 +124,11 @@ if [[ -z "${EXTENSIONS##*,pdo_oci,*}" ]]; then
     echo "---------- Install pdo_oci ----------"
 	 install-php-extensions  pdo_oci
 fi
+
+if [[ -z "${EXTENSIONS##*,oci8,*}" ]]; then
+    echo "---------- Install oci8 ----------"
+   install-php-extensions oci8
+fi
 # end
 
 
@@ -230,11 +235,6 @@ if [[ -z "${EXTENSIONS##*,pgsql,*}" ]]; then
     && docker-php-ext-install ${MC} pgsql
 fi
 
-if [[ -z "${EXTENSIONS##*,oci8,*}" ]]; then
-    echo "---------- Install oci8 ----------"
-	docker-php-ext-install ${MC} oci8
-fi
-
 if [[ -z "${EXTENSIONS##*,odbc,*}" ]]; then
     echo "---------- Install odbc ----------"
 	docker-php-ext-install ${MC} odbc
diff --git a/apps/php7/7.2.34/build/php/extensions/install.sh b/apps/php7/7.2.34/build/php/extensions/install.sh
index 6eff2a96..2a68096e 100644
--- a/apps/php7/7.2.34/build/php/extensions/install.sh
+++ b/apps/php7/7.2.34/build/php/extensions/install.sh
@@ -124,6 +124,11 @@ if [[ -z "${EXTENSIONS##*,pdo_oci,*}" ]]; then
     echo "---------- Install pdo_oci ----------"
 	 install-php-extensions  pdo_oci
 fi
+
+if [[ -z "${EXTENSIONS##*,oci8,*}" ]]; then
+    echo "---------- Install oci8 ----------"
+   install-php-extensions oci8
+fi
 # end
 
 
@@ -230,11 +235,6 @@ if [[ -z "${EXTENSIONS##*,pgsql,*}" ]]; then
     && docker-php-ext-install ${MC} pgsql
 fi
 
-if [[ -z "${EXTENSIONS##*,oci8,*}" ]]; then
-    echo "---------- Install oci8 ----------"
-	docker-php-ext-install ${MC} oci8
-fi
-
 if [[ -z "${EXTENSIONS##*,odbc,*}" ]]; then
     echo "---------- Install odbc ----------"
 	docker-php-ext-install ${MC} odbc
diff --git a/apps/php7/7.3.33/build/php/extensions/install.sh b/apps/php7/7.3.33/build/php/extensions/install.sh
index 6eff2a96..2a68096e 100644
--- a/apps/php7/7.3.33/build/php/extensions/install.sh
+++ b/apps/php7/7.3.33/build/php/extensions/install.sh
@@ -124,6 +124,11 @@ if [[ -z "${EXTENSIONS##*,pdo_oci,*}" ]]; then
     echo "---------- Install pdo_oci ----------"
 	 install-php-extensions  pdo_oci
 fi
+
+if [[ -z "${EXTENSIONS##*,oci8,*}" ]]; then
+    echo "---------- Install oci8 ----------"
+   install-php-extensions oci8
+fi
 # end
 
 
@@ -230,11 +235,6 @@ if [[ -z "${EXTENSIONS##*,pgsql,*}" ]]; then
     && docker-php-ext-install ${MC} pgsql
 fi
 
-if [[ -z "${EXTENSIONS##*,oci8,*}" ]]; then
-    echo "---------- Install oci8 ----------"
-	docker-php-ext-install ${MC} oci8
-fi
-
 if [[ -z "${EXTENSIONS##*,odbc,*}" ]]; then
     echo "---------- Install odbc ----------"
 	docker-php-ext-install ${MC} odbc
diff --git a/apps/php7/7.4.33/build/php/extensions/install.sh b/apps/php7/7.4.33/build/php/extensions/install.sh
index 6eff2a96..2a68096e 100644
--- a/apps/php7/7.4.33/build/php/extensions/install.sh
+++ b/apps/php7/7.4.33/build/php/extensions/install.sh
@@ -124,6 +124,11 @@ if [[ -z "${EXTENSIONS##*,pdo_oci,*}" ]]; then
     echo "---------- Install pdo_oci ----------"
 	 install-php-extensions  pdo_oci
 fi
+
+if [[ -z "${EXTENSIONS##*,oci8,*}" ]]; then
+    echo "---------- Install oci8 ----------"
+   install-php-extensions oci8
+fi
 # end
 
 
@@ -230,11 +235,6 @@ if [[ -z "${EXTENSIONS##*,pgsql,*}" ]]; then
     && docker-php-ext-install ${MC} pgsql
 fi
 
-if [[ -z "${EXTENSIONS##*,oci8,*}" ]]; then
-    echo "---------- Install oci8 ----------"
-	docker-php-ext-install ${MC} oci8
-fi
-
 if [[ -z "${EXTENSIONS##*,odbc,*}" ]]; then
     echo "---------- Install odbc ----------"
 	docker-php-ext-install ${MC} odbc
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 233da9ce..e21cb86c 100644
--- a/apps/php8/8.0.30/build/php/extensions/install.sh
+++ b/apps/php8/8.0.30/build/php/extensions/install.sh
@@ -129,6 +129,11 @@ if [[ -z "${EXTENSIONS##*,pdo_oci,*}" ]]; then
 	 install-php-extensions  pdo_oci
 fi
 
+if [[ -z "${EXTENSIONS##*,oci8,*}" ]]; then
+   echo "---------- Install oci8 ----------"
+	 install-php-extensions oci8
+fi
+
 # end
 
 
@@ -235,11 +240,6 @@ if [[ -z "${EXTENSIONS##*,pgsql,*}" ]]; then
     && docker-php-ext-install ${MC} pgsql
 fi
 
-if [[ -z "${EXTENSIONS##*,oci8,*}" ]]; then
-    echo "---------- Install oci8 ----------"
-	docker-php-ext-install ${MC} oci8
-fi
-
 if [[ -z "${EXTENSIONS##*,odbc,*}" ]]; then
     echo "---------- Install odbc ----------"
 	docker-php-ext-install ${MC} odbc
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 233da9ce..e21cb86c 100644
--- a/apps/php8/8.1.29/build/php/extensions/install.sh
+++ b/apps/php8/8.1.29/build/php/extensions/install.sh
@@ -129,6 +129,11 @@ if [[ -z "${EXTENSIONS##*,pdo_oci,*}" ]]; then
 	 install-php-extensions  pdo_oci
 fi
 
+if [[ -z "${EXTENSIONS##*,oci8,*}" ]]; then
+   echo "---------- Install oci8 ----------"
+	 install-php-extensions oci8
+fi
+
 # end
 
 
@@ -235,11 +240,6 @@ if [[ -z "${EXTENSIONS##*,pgsql,*}" ]]; then
     && docker-php-ext-install ${MC} pgsql
 fi
 
-if [[ -z "${EXTENSIONS##*,oci8,*}" ]]; then
-    echo "---------- Install oci8 ----------"
-	docker-php-ext-install ${MC} oci8
-fi
-
 if [[ -z "${EXTENSIONS##*,odbc,*}" ]]; then
     echo "---------- Install odbc ----------"
 	docker-php-ext-install ${MC} odbc
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 233da9ce..e21cb86c 100644
--- a/apps/php8/8.2.20/build/php/extensions/install.sh
+++ b/apps/php8/8.2.20/build/php/extensions/install.sh
@@ -129,6 +129,11 @@ if [[ -z "${EXTENSIONS##*,pdo_oci,*}" ]]; then
 	 install-php-extensions  pdo_oci
 fi
 
+if [[ -z "${EXTENSIONS##*,oci8,*}" ]]; then
+   echo "---------- Install oci8 ----------"
+	 install-php-extensions oci8
+fi
+
 # end
 
 
@@ -235,11 +240,6 @@ if [[ -z "${EXTENSIONS##*,pgsql,*}" ]]; then
     && docker-php-ext-install ${MC} pgsql
 fi
 
-if [[ -z "${EXTENSIONS##*,oci8,*}" ]]; then
-    echo "---------- Install oci8 ----------"
-	docker-php-ext-install ${MC} oci8
-fi
-
 if [[ -z "${EXTENSIONS##*,odbc,*}" ]]; then
     echo "---------- Install odbc ----------"
 	docker-php-ext-install ${MC} odbc
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 233da9ce..e21cb86c 100644
--- a/apps/php8/8.3.8/build/php/extensions/install.sh
+++ b/apps/php8/8.3.8/build/php/extensions/install.sh
@@ -129,6 +129,11 @@ if [[ -z "${EXTENSIONS##*,pdo_oci,*}" ]]; then
 	 install-php-extensions  pdo_oci
 fi
 
+if [[ -z "${EXTENSIONS##*,oci8,*}" ]]; then
+   echo "---------- Install oci8 ----------"
+	 install-php-extensions oci8
+fi
+
 # end
 
 
@@ -235,11 +240,6 @@ if [[ -z "${EXTENSIONS##*,pgsql,*}" ]]; then
     && docker-php-ext-install ${MC} pgsql
 fi
 
-if [[ -z "${EXTENSIONS##*,oci8,*}" ]]; then
-    echo "---------- Install oci8 ----------"
-	docker-php-ext-install ${MC} oci8
-fi
-
 if [[ -z "${EXTENSIONS##*,odbc,*}" ]]; then
     echo "---------- Install odbc ----------"
 	docker-php-ext-install ${MC} odbc