From 7bc40422daccb57cdf2593a226506789b73286b0 Mon Sep 17 00:00:00 2001
From: Hsiao-nan Cheung <niheaven@gmail.com>
Date: Thu, 9 Mar 2023 03:58:18 +0800
Subject: [PATCH] oracle-instant-client-sqlplus: Add version 21.8.0.0.0 (#4524)

---
 bucket/oracle-instant-client-odbc.json    |  2 +-
 bucket/oracle-instant-client-sdk.json     |  2 +-
 bucket/oracle-instant-client-sqlplus.json | 47 +++++++++++++++++++++++
 bucket/oracle-instant-client.json         |  2 +-
 4 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 bucket/oracle-instant-client-sqlplus.json

diff --git a/bucket/oracle-instant-client-odbc.json b/bucket/oracle-instant-client-odbc.json
index a73061a238..041de59ccf 100644
--- a/bucket/oracle-instant-client-odbc.json
+++ b/bucket/oracle-instant-client-odbc.json
@@ -29,7 +29,7 @@
         ]
     },
     "checkver": {
-        "url": "https://www.oracle.com/database/technologies/instant-client/winx64-64-downloads.html",
+        "url": "https://www.oracle.com/database/technologies/instant-client/microsoft-windows-32-downloads.html",
         "regex": "Version ([\\d.]+)",
         "useragent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64)"
     },
diff --git a/bucket/oracle-instant-client-sdk.json b/bucket/oracle-instant-client-sdk.json
index c889a76c6f..2bf1c4e942 100644
--- a/bucket/oracle-instant-client-sdk.json
+++ b/bucket/oracle-instant-client-sdk.json
@@ -29,7 +29,7 @@
         ]
     },
     "checkver": {
-        "url": "https://www.oracle.com/database/technologies/instant-client/winx64-64-downloads.html",
+        "url": "https://www.oracle.com/database/technologies/instant-client/microsoft-windows-32-downloads.html",
         "regex": "Version ([\\d.]+)",
         "useragent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64)"
     },
diff --git a/bucket/oracle-instant-client-sqlplus.json b/bucket/oracle-instant-client-sqlplus.json
new file mode 100644
index 0000000000..ce66040c9d
--- /dev/null
+++ b/bucket/oracle-instant-client-sqlplus.json
@@ -0,0 +1,47 @@
+{
+    "version": "21.8.0.0.0",
+    "description": "The SQL*Plus command line tool for SQL and PL/SQL queries with Oracle Instant Client.",
+    "homepage": "https://www.oracle.com/database/technologies/instant-client.html",
+    "license": {
+        "identifier": "Freeware",
+        "url": "https://www.oracle.com/downloads/licenses/instant-client-lic.html"
+    },
+    "depends": "oracle-instant-client",
+    "architecture": {
+        "64bit": {
+            "url": "https://download.oracle.com/otn_software/nt/instantclient/218000/instantclient-sqlplus-windows.x64-21.8.0.0.0dbru.zip",
+            "hash": "ff87a267a16cf4811165e74a47e238db8ab679b31b5729c4435ac2cfcf1c8360"
+        },
+        "32bit": {
+            "url": "https://download.oracle.com/otn_software/nt/instantclient/218000/instantclient-sqlplus-nt-21.8.0.0.0dbru.zip",
+            "hash": "f0e2c465e3c36247147bcf083aa4d51f2f01eb743450aff5ef2fffbd13608ba1"
+        }
+    },
+    "extract_dir": "instantclient_21_8",
+    "pre_install": [
+        "$instantclient = versiondir 'oracle-instant-client' 'current'",
+        "Copy-Item -Path \"$dir\\*\" -Destination \"$instantclient\" -Force -Recurse | Out-Null"
+    ],
+    "uninstaller": {
+        "script": [
+            "$instantclient = versiondir 'oracle-instant-client' 'current'",
+            "Get-ChildItem -Path \"$dir\" -Exclude *.json | ForEach-Object { Remove-Item -LiteralPath \"$instantclient\\$($_.Name)\" -Recurse -Force -ErrorAction SilentlyContinue }"
+        ]
+    },
+    "checkver": {
+        "url": "https://www.oracle.com/database/technologies/instant-client/microsoft-windows-32-downloads.html",
+        "regex": "Version ([\\d.]+)",
+        "useragent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64)"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://download.oracle.com/otn_software/nt/instantclient/$cleanVersion/instantclient-sqlplus-windows.x64-$versiondbru.zip"
+            },
+            "32bit": {
+                "url": "https://download.oracle.com/otn_software/nt/instantclient/$cleanVersion/instantclient-sqlplus-nt-$versiondbru.zip"
+            }
+        },
+        "extract_dir": "instantclient_$majorVersion_$minorVersion"
+    }
+}
diff --git a/bucket/oracle-instant-client.json b/bucket/oracle-instant-client.json
index 42726a3490..6830f2489c 100644
--- a/bucket/oracle-instant-client.json
+++ b/bucket/oracle-instant-client.json
@@ -31,7 +31,7 @@
     "env_add_path": ".",
     "persist": "network\\admin",
     "checkver": {
-        "url": "https://www.oracle.com/database/technologies/instant-client/winx64-64-downloads.html",
+        "url": "https://www.oracle.com/database/technologies/instant-client/microsoft-windows-32-downloads.html",
         "regex": "Version ([\\d.]+)",
         "useragent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64)"
     },