From 7fcbf543db0fd9255104a77c1bfffb5c56b2326b Mon Sep 17 00:00:00 2001 From: neur1n Date: Mon, 11 Mar 2024 10:25:44 +0800 Subject: [PATCH] fix: update modules/virtual_environments/nu_msvs to work with nushell 0.91.0 (#784) Fixed the `glob` related code as mentioned in title. --- modules/virtual_environments/nu_msvs/README.md | 2 +- modules/virtual_environments/nu_msvs/nu_msvs.nu | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/virtual_environments/nu_msvs/README.md b/modules/virtual_environments/nu_msvs/README.md index a69be17..c8be425 100644 --- a/modules/virtual_environments/nu_msvs/README.md +++ b/modules/virtual_environments/nu_msvs/README.md @@ -3,7 +3,7 @@ A module for Using Microsoft Visual Studio (MSVS) command line tools from Nushel ## Prerequisites -- [nushell](https://github.com/nushell/nushell) >= 0.83.0 +- [nushell](https://github.com/nushell/nushell) >= 0.91.0 - [vswhere](https://github.com/microsoft/vswhere) standalone or comes with VS diff --git a/modules/virtual_environments/nu_msvs/nu_msvs.nu b/modules/virtual_environments/nu_msvs/nu_msvs.nu index 79b88c2..ee0db76 100644 --- a/modules/virtual_environments/nu_msvs/nu_msvs.nu +++ b/modules/virtual_environments/nu_msvs/nu_msvs.nu @@ -14,10 +14,10 @@ export-env { $env.MSVS_MSVC_ROOT = ( if not ($"($env.MSVS_ROOT)/VC/Tools/MSVC/" | path exists) { "" - } else if (ls $"($env.MSVS_ROOT)/VC/Tools/MSVC/*" | is-empty) { + } else if (ls ($"($env.MSVS_ROOT)/VC/Tools/MSVC/*" | into glob) | is-empty) { "" } else { - ((ls $"($env.MSVS_ROOT)/VC/Tools/MSVC/*").name.0 | str replace -a '\\' '/') + ((ls ($"($env.MSVS_ROOT)/VC/Tools/MSVC/*" | into glob)).name.0 | str replace -a '\\' '/') }) $env.MSVS_MSDK_ROOT = (registry query --hklm 'SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0' InstallationFolder | get value)