Some more fixes

ScoopInstaller · Jan 8, 2025 · 7ae0971 · 7ae0971
1 parent 23b8d2a
commit 7ae0971
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/bucket/oracle-instant-client-odbc21.json b/bucket/oracle-instant-client-odbc21.json
@@ -6,7 +6,7 @@
         "identifier": "Freeware",
         "url": "https://www.oracle.com/downloads/licenses/instant-client-lic.html"
     },
-    "depends": "oracle-instant-client",
+    "depends": "oracle-instant-client21",
     "architecture": {
         "64bit": {
             "url": "https://download.oracle.com/otn_software/nt/instantclient/2115000/instantclient-odbc-windows.x64-21.15.0.0.0dbru.zip",
@@ -19,12 +19,12 @@
     },
     "extract_dir": "instantclient_21_15",
     "pre_install": [
-        "$instantclient = versiondir 'oracle-instant-client' 'current'",
+        "$instantclient = currentdir 'oracle-instant-client21'",
         "Copy-Item -Path \"$dir\\*\" -Destination \"$instantclient\" -Force -Recurse | Out-Null"
     ],
     "uninstaller": {
         "script": [
-            "$instantclient = versiondir 'oracle-instant-client' 'current'",
+            "$instantclient = currentdir 'oracle-instant-client21'",
             "Get-ChildItem -Path \"$dir\" -Exclude *.json | ForEach-Object { Remove-Item -LiteralPath \"$instantclient\\$($_.Name)\" -Recurse -Force -ErrorAction SilentlyContinue }"
         ]
     },

diff --git a/bucket/oracle-instant-client-sdk21.json b/bucket/oracle-instant-client-sdk21.json
@@ -6,7 +6,7 @@
         "identifier": "Freeware",
         "url": "https://www.oracle.com/downloads/licenses/instant-client-lic.html"
     },
-    "depends": "oracle-instant-client",
+    "depends": "oracle-instant-client21",
     "architecture": {
         "64bit": {
             "url": "https://download.oracle.com/otn_software/nt/instantclient/2115000/instantclient-sdk-windows.x64-21.15.0.0.0dbru.zip",
@@ -19,12 +19,12 @@
     },
     "extract_dir": "instantclient_21_15",
     "pre_install": [
-        "$instantclient = versiondir 'oracle-instant-client' 'current'",
+        "$instantclient = currentdir 'oracle-instant-client21'",
         "Copy-Item -Path \"$dir\\*\" -Destination \"$instantclient\" -Force -Recurse | Out-Null"
     ],
     "uninstaller": {
         "script": [
-            "$instantclient = versiondir 'oracle-instant-client' 'current'",
+            "$instantclient = currentdir 'oracle-instant-client21'",
             "Get-ChildItem -Path \"$dir\" -Exclude *.json | ForEach-Object { Remove-Item -LiteralPath \"$instantclient\\$($_.Name)\" -Recurse -Force -ErrorAction SilentlyContinue }"
         ]
     },

diff --git a/bucket/oracle-instant-client-sqlplus21.json b/bucket/oracle-instant-client-sqlplus21.json
@@ -6,7 +6,7 @@
         "identifier": "Freeware",
         "url": "https://www.oracle.com/downloads/licenses/instant-client-lic.html"
     },
-    "depends": "oracle-instant-client",
+    "depends": "oracle-instant-client21",
     "architecture": {
         "64bit": {
             "url": "https://download.oracle.com/otn_software/nt/instantclient/2115000/instantclient-sqlplus-windows.x64-21.15.0.0.0dbru.zip",
@@ -19,12 +19,12 @@
     },
     "extract_dir": "instantclient_21_15",
     "pre_install": [
-        "$instantclient = versiondir 'oracle-instant-client' 'current'",
+        "$instantclient = currentdir 'oracle-instant-client21'",
         "Copy-Item -Path \"$dir\\*\" -Destination \"$instantclient\" -Force -Recurse | Out-Null"
     ],
     "uninstaller": {
         "script": [
-            "$instantclient = versiondir 'oracle-instant-client' 'current'",
+            "$instantclient = currentdir 'oracle-instant-client21'",
             "Get-ChildItem -Path \"$dir\" -Exclude *.json | ForEach-Object { Remove-Item -LiteralPath \"$instantclient\\$($_.Name)\" -Recurse -Force -ErrorAction SilentlyContinue }"
         ]
     },

diff --git a/bucket/oracle-instant-client19.json b/bucket/oracle-instant-client19.json
@@ -31,9 +31,9 @@
     "env_add_path": ".",
     "persist": "network\\admin",
     "checkver": {
-        "useragent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64)",
         "url": "https://www.oracle.com/database/technologies/instant-client/microsoft-windows-32-downloads.html",
-        "regex": "Version (19[\\d.]+)"
+        "regex": "Version (19[\\d.]+)",
+        "useragent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64)"
     },
     "autoupdate": {
         "architecture": {

diff --git a/bucket/oracle-instant-client21.json b/bucket/oracle-instant-client21.json
@@ -6,6 +6,9 @@
         "identifier": "Freeware",
         "url": "https://www.oracle.com/downloads/licenses/instant-client-lic.html"
     },
+    "suggest": {
+        "vcredist": "extras/vcredist2022"
+    },
     "architecture": {
         "64bit": {
             "url": "https://download.oracle.com/otn_software/nt/instantclient/2115000/instantclient-basic-windows.x64-21.15.0.0.0dbru.zip",
@@ -24,9 +27,6 @@
             }
         }
     },
-    "suggest": {
-        "vcredist": "extras/vcredist2022"
-    },
     "extract_dir": "instantclient_21_15",
     "env_add_path": ".",
     "persist": "network\\admin",