From 93aa1f947a47d6d109a613ee733cf68543051201 Mon Sep 17 00:00:00 2001
From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com>
Date: Fri, 20 Sep 2024 10:35:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=20PHP=20=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E5=AE=89=E8=A3=85=20pdo=5Foci=20=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20(#2148)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/php7/7.0.33/build/php/extensions/install.sh b/php7/7.0.33/build/php/extensions/install.sh
index 66093110e..6eff2a965 100644
--- a/php7/7.0.33/build/php/extensions/install.sh
+++ b/php7/7.0.33/build/php/extensions/install.sh
@@ -119,6 +119,11 @@ if [[ -z "${EXTENSIONS##*,snuffleupagus,*}" ]]; then
     echo "---------- Install snuffleupagus ----------"
 	  install-php-extensions snuffleupagus
 fi
+
+if [[ -z "${EXTENSIONS##*,pdo_oci,*}" ]]; then
+    echo "---------- Install pdo_oci ----------"
+	 install-php-extensions  pdo_oci
+fi
 # end
 
 
@@ -208,11 +213,6 @@ if [[ -z "${EXTENSIONS##*,pdo_dblib,*}" ]]; then
 	docker-php-ext-install ${MC} pdo_dblib
 fi
 
-if [[ -z "${EXTENSIONS##*,pdo_oci,*}" ]]; then
-    echo "---------- Install pdo_oci ----------"
-	docker-php-ext-install ${MC} pdo_oci
-fi
-
 if [[ -z "${EXTENSIONS##*,pdo_odbc,*}" ]]; then
     echo "---------- Install pdo_odbc ----------"
 	docker-php-ext-install ${MC} pdo_odbc
diff --git a/php7/7.1.33/build/php/extensions/install.sh b/php7/7.1.33/build/php/extensions/install.sh
index 66093110e..6eff2a965 100644
--- a/php7/7.1.33/build/php/extensions/install.sh
+++ b/php7/7.1.33/build/php/extensions/install.sh
@@ -119,6 +119,11 @@ if [[ -z "${EXTENSIONS##*,snuffleupagus,*}" ]]; then
     echo "---------- Install snuffleupagus ----------"
 	  install-php-extensions snuffleupagus
 fi
+
+if [[ -z "${EXTENSIONS##*,pdo_oci,*}" ]]; then
+    echo "---------- Install pdo_oci ----------"
+	 install-php-extensions  pdo_oci
+fi
 # end
 
 
@@ -208,11 +213,6 @@ if [[ -z "${EXTENSIONS##*,pdo_dblib,*}" ]]; then
 	docker-php-ext-install ${MC} pdo_dblib
 fi
 
-if [[ -z "${EXTENSIONS##*,pdo_oci,*}" ]]; then
-    echo "---------- Install pdo_oci ----------"
-	docker-php-ext-install ${MC} pdo_oci
-fi
-
 if [[ -z "${EXTENSIONS##*,pdo_odbc,*}" ]]; then
     echo "---------- Install pdo_odbc ----------"
 	docker-php-ext-install ${MC} pdo_odbc
diff --git a/php7/7.2.34/build/php/extensions/install.sh b/php7/7.2.34/build/php/extensions/install.sh
index 66093110e..6eff2a965 100644
--- a/php7/7.2.34/build/php/extensions/install.sh
+++ b/php7/7.2.34/build/php/extensions/install.sh
@@ -119,6 +119,11 @@ if [[ -z "${EXTENSIONS##*,snuffleupagus,*}" ]]; then
     echo "---------- Install snuffleupagus ----------"
 	  install-php-extensions snuffleupagus
 fi
+
+if [[ -z "${EXTENSIONS##*,pdo_oci,*}" ]]; then
+    echo "---------- Install pdo_oci ----------"
+	 install-php-extensions  pdo_oci
+fi
 # end
 
 
@@ -208,11 +213,6 @@ if [[ -z "${EXTENSIONS##*,pdo_dblib,*}" ]]; then
 	docker-php-ext-install ${MC} pdo_dblib
 fi
 
-if [[ -z "${EXTENSIONS##*,pdo_oci,*}" ]]; then
-    echo "---------- Install pdo_oci ----------"
-	docker-php-ext-install ${MC} pdo_oci
-fi
-
 if [[ -z "${EXTENSIONS##*,pdo_odbc,*}" ]]; then
     echo "---------- Install pdo_odbc ----------"
 	docker-php-ext-install ${MC} pdo_odbc
diff --git a/php7/7.3.33/build/php/extensions/install.sh b/php7/7.3.33/build/php/extensions/install.sh
index 66093110e..6eff2a965 100644
--- a/php7/7.3.33/build/php/extensions/install.sh
+++ b/php7/7.3.33/build/php/extensions/install.sh
@@ -119,6 +119,11 @@ if [[ -z "${EXTENSIONS##*,snuffleupagus,*}" ]]; then
     echo "---------- Install snuffleupagus ----------"
 	  install-php-extensions snuffleupagus
 fi
+
+if [[ -z "${EXTENSIONS##*,pdo_oci,*}" ]]; then
+    echo "---------- Install pdo_oci ----------"
+	 install-php-extensions  pdo_oci
+fi
 # end
 
 
@@ -208,11 +213,6 @@ if [[ -z "${EXTENSIONS##*,pdo_dblib,*}" ]]; then
 	docker-php-ext-install ${MC} pdo_dblib
 fi
 
-if [[ -z "${EXTENSIONS##*,pdo_oci,*}" ]]; then
-    echo "---------- Install pdo_oci ----------"
-	docker-php-ext-install ${MC} pdo_oci
-fi
-
 if [[ -z "${EXTENSIONS##*,pdo_odbc,*}" ]]; then
     echo "---------- Install pdo_odbc ----------"
 	docker-php-ext-install ${MC} pdo_odbc
diff --git a/php7/7.4.33/build/php/extensions/install.sh b/php7/7.4.33/build/php/extensions/install.sh
index 66093110e..6eff2a965 100644
--- a/php7/7.4.33/build/php/extensions/install.sh
+++ b/php7/7.4.33/build/php/extensions/install.sh
@@ -119,6 +119,11 @@ if [[ -z "${EXTENSIONS##*,snuffleupagus,*}" ]]; then
     echo "---------- Install snuffleupagus ----------"
 	  install-php-extensions snuffleupagus
 fi
+
+if [[ -z "${EXTENSIONS##*,pdo_oci,*}" ]]; then
+    echo "---------- Install pdo_oci ----------"
+	 install-php-extensions  pdo_oci
+fi
 # end
 
 
@@ -208,11 +213,6 @@ if [[ -z "${EXTENSIONS##*,pdo_dblib,*}" ]]; then
 	docker-php-ext-install ${MC} pdo_dblib
 fi
 
-if [[ -z "${EXTENSIONS##*,pdo_oci,*}" ]]; then
-    echo "---------- Install pdo_oci ----------"
-	docker-php-ext-install ${MC} pdo_oci
-fi
-
 if [[ -z "${EXTENSIONS##*,pdo_odbc,*}" ]]; then
     echo "---------- Install pdo_odbc ----------"
 	docker-php-ext-install ${MC} pdo_odbc
diff --git a/php8/8.0.30/build/php/extensions/install.sh b/php8/8.0.30/build/php/extensions/install.sh
index bb5b603a0..233da9ce6 100644
--- a/php8/8.0.30/build/php/extensions/install.sh
+++ b/php8/8.0.30/build/php/extensions/install.sh
@@ -124,6 +124,11 @@ if [[ -z "${EXTENSIONS##*,snuffleupagus,*}" ]]; then
 	  install-php-extensions snuffleupagus
 fi
 
+if [[ -z "${EXTENSIONS##*,pdo_oci,*}" ]]; then
+    echo "---------- Install pdo_oci ----------"
+	 install-php-extensions  pdo_oci
+fi
+
 # end
 
 
@@ -213,11 +218,6 @@ if [[ -z "${EXTENSIONS##*,pdo_dblib,*}" ]]; then
 	docker-php-ext-install ${MC} pdo_dblib
 fi
 
-if [[ -z "${EXTENSIONS##*,pdo_oci,*}" ]]; then
-    echo "---------- Install pdo_oci ----------"
-	docker-php-ext-install ${MC} pdo_oci
-fi
-
 if [[ -z "${EXTENSIONS##*,pdo_odbc,*}" ]]; then
     echo "---------- Install pdo_odbc ----------"
 	docker-php-ext-install ${MC} pdo_odbc
diff --git a/php8/8.1.29/build/php/extensions/install.sh b/php8/8.1.29/build/php/extensions/install.sh
index bb5b603a0..233da9ce6 100644
--- a/php8/8.1.29/build/php/extensions/install.sh
+++ b/php8/8.1.29/build/php/extensions/install.sh
@@ -124,6 +124,11 @@ if [[ -z "${EXTENSIONS##*,snuffleupagus,*}" ]]; then
 	  install-php-extensions snuffleupagus
 fi
 
+if [[ -z "${EXTENSIONS##*,pdo_oci,*}" ]]; then
+    echo "---------- Install pdo_oci ----------"
+	 install-php-extensions  pdo_oci
+fi
+
 # end
 
 
@@ -213,11 +218,6 @@ if [[ -z "${EXTENSIONS##*,pdo_dblib,*}" ]]; then
 	docker-php-ext-install ${MC} pdo_dblib
 fi
 
-if [[ -z "${EXTENSIONS##*,pdo_oci,*}" ]]; then
-    echo "---------- Install pdo_oci ----------"
-	docker-php-ext-install ${MC} pdo_oci
-fi
-
 if [[ -z "${EXTENSIONS##*,pdo_odbc,*}" ]]; then
     echo "---------- Install pdo_odbc ----------"
 	docker-php-ext-install ${MC} pdo_odbc
diff --git a/php8/8.2.20/build/php/extensions/install.sh b/php8/8.2.20/build/php/extensions/install.sh
index bb5b603a0..233da9ce6 100644
--- a/php8/8.2.20/build/php/extensions/install.sh
+++ b/php8/8.2.20/build/php/extensions/install.sh
@@ -124,6 +124,11 @@ if [[ -z "${EXTENSIONS##*,snuffleupagus,*}" ]]; then
 	  install-php-extensions snuffleupagus
 fi
 
+if [[ -z "${EXTENSIONS##*,pdo_oci,*}" ]]; then
+    echo "---------- Install pdo_oci ----------"
+	 install-php-extensions  pdo_oci
+fi
+
 # end
 
 
@@ -213,11 +218,6 @@ if [[ -z "${EXTENSIONS##*,pdo_dblib,*}" ]]; then
 	docker-php-ext-install ${MC} pdo_dblib
 fi
 
-if [[ -z "${EXTENSIONS##*,pdo_oci,*}" ]]; then
-    echo "---------- Install pdo_oci ----------"
-	docker-php-ext-install ${MC} pdo_oci
-fi
-
 if [[ -z "${EXTENSIONS##*,pdo_odbc,*}" ]]; then
     echo "---------- Install pdo_odbc ----------"
 	docker-php-ext-install ${MC} pdo_odbc
diff --git a/php8/8.3.8/build/php/extensions/install.sh b/php8/8.3.8/build/php/extensions/install.sh
index bb5b603a0..233da9ce6 100644
--- a/php8/8.3.8/build/php/extensions/install.sh
+++ b/php8/8.3.8/build/php/extensions/install.sh
@@ -124,6 +124,11 @@ if [[ -z "${EXTENSIONS##*,snuffleupagus,*}" ]]; then
 	  install-php-extensions snuffleupagus
 fi
 
+if [[ -z "${EXTENSIONS##*,pdo_oci,*}" ]]; then
+    echo "---------- Install pdo_oci ----------"
+	 install-php-extensions  pdo_oci
+fi
+
 # end
 
 
@@ -213,11 +218,6 @@ if [[ -z "${EXTENSIONS##*,pdo_dblib,*}" ]]; then
 	docker-php-ext-install ${MC} pdo_dblib
 fi
 
-if [[ -z "${EXTENSIONS##*,pdo_oci,*}" ]]; then
-    echo "---------- Install pdo_oci ----------"
-	docker-php-ext-install ${MC} pdo_oci
-fi
-
 if [[ -z "${EXTENSIONS##*,pdo_odbc,*}" ]]; then
     echo "---------- Install pdo_odbc ----------"
 	docker-php-ext-install ${MC} pdo_odbc