From 8730cb9c714798a34e7a7e8b7e8c951fdd892f7f Mon Sep 17 00:00:00 2001
From: Hsiao-nan Cheung <niheaven@gmail.com>
Date: Sat, 10 Dec 2022 23:52:48 +0800
Subject: [PATCH] (chore): Fix `current_version` warnings

---
 bucket/luarocks.json | 2 +-
 bucket/mro.json      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bucket/luarocks.json b/bucket/luarocks.json
index 32ed5a437c..397e390661 100644
--- a/bucket/luarocks.json
+++ b/bucket/luarocks.json
@@ -19,7 +19,7 @@
     "pre_install": [
         "$file = 'config.lua'",
         "$lua = (versiondir 'lua' 'current' $global) -replace \"\\\\\", '/'",
-        "$v1 = (current_version 'lua' $global) -replace \"^(\\d.\\d).*\", '$1'",
+        "$v1 = (Select-CurrentVersion 'lua' $global) -replace \"^(\\d.\\d).*\", '$1'",
         "$v2 = $v1 -replace \"[.]\", ''",
         "$rocks = \"$(versiondir 'luarocks' 'current' $global)\\rocks\" -replace \"\\\\\", \"/\"",
         "if (!(Test-Path \"$persist_dir\\$file\")) {",
diff --git a/bucket/mro.json b/bucket/mro.json
index 0ab03485a1..d9c0f14054 100644
--- a/bucket/mro.json
+++ b/bucket/mro.json
@@ -32,9 +32,9 @@
                     "movedir \"$dir\\Setup\\bin\\x64\" \"$dir\\bin\\x64\" | Out-Null",
                     "movedir \"$dir\\Setup\\library\" \"$dir\\library\" | Out-Null",
                     "Remove-Item \"$dir\\_tmp\", \"$dir\\Setup\", \"$dir\\$fname\" -Force -Recurse",
-                    "if (Test-Path (appdir 'rtools' $global)) {",
+                    "if (Test-Path (appdir 'rtools40' $global)) {",
                     "   $renvloc = \"$dir\\etc\\Renviron.site\"",
-                    "   $rtoolsloc = versiondir 'rtools' (current_version 'rtools' $global) $global",
+                    "   $rtoolsloc = versiondir 'rtools40' (Select-CurrentVersion 'rtools40' $global) $global",
                     "   if (Test-Path $renvloc) {",
                     "       $renv = Get-Content $renvloc -Encoding ASCII",
                     "   } else {",