From 311fb0907c5879d8cee4e90ce42828ffb447dcc0 Mon Sep 17 00:00:00 2001 From: Chawye Hsu Date: Fri, 11 Oct 2024 10:33:00 +0800 Subject: [PATCH 1/2] fix(scoop-bucket): Add missing import for `no_junction` envs Signed-off-by: Chawye Hsu --- libexec/scoop-bucket.ps1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libexec/scoop-bucket.ps1 b/libexec/scoop-bucket.ps1 index ceb28865a5..d3b7728559 100644 --- a/libexec/scoop-bucket.ps1 +++ b/libexec/scoop-bucket.ps1 @@ -19,6 +19,10 @@ # scoop bucket known param($cmd, $name, $repo) +if (get_config NO_JUNCTION) { + . "$PSScriptRoot\..\lib\versions.ps1" +} + if (get_config USE_SQLITE_CACHE) { . "$PSScriptRoot\..\lib\manifest.ps1" . "$PSScriptRoot\..\lib\database.ps1" From 4d08c7fd1b363108b3a07c18a6a9f54c31b967cb Mon Sep 17 00:00:00 2001 From: Chawye Hsu Date: Fri, 11 Oct 2024 10:38:58 +0800 Subject: [PATCH 2/2] chglog Signed-off-by: Chawye Hsu --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bdfc332dac..d9a56e46ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,8 @@ - **scoop-download|install|update:** Fallback to default downloader when aria2 fails ([#4292](https://github.com/ScoopInstaller/Scoop/issues/4292)) - **decompress**: `Expand-7zipArchive` only delete temp dir / `$extractDir` if it is empty ([#6092](https://github.com/ScoopInstaller/Scoop/issues/6092)) - **commands**: Handling broken aliases ([#6141](https://github.com/ScoopInstaller/Scoop/issues/6141)) -- **shim:** Do not suppress `stderr`, properly check `wslpath`/`cygpath` command first ([#6114](https://github.com/ScoopInstaller/Scoop/pull/6114)) +- **shim:** Do not suppress `stderr`, properly check `wslpath`/`cygpath` command first ([#6114](https://github.com/ScoopInstaller/Scoop/issues/6114)) +- **scoop-bucket:** Add missing import for `no_junction` envs ([#6181](https://github.com/ScoopInstaller/Scoop/issues/6181)) ### Code Refactoring @@ -53,7 +54,7 @@ - **checkver:** Correct error messages ([#6024](https://github.com/ScoopInstaller/Scoop/issues/6024)) - **core:** Search for Git executable instead of any cmdlet ([#5998](https://github.com/ScoopInstaller/Scoop/issues/5998)) - **core:** Use correct path in 'bash' ([#6006](https://github.com/ScoopInstaller/Scoop/issues/6006)) -- **core:** Limit the number of commands to get when search for git executable ([#6013](https://github.com/ScoopInstaller/Scoop/pull/6013)) +- **core:** Limit the number of commands to get when search for git executable ([#6013](https://github.com/ScoopInstaller/Scoop/issues/6013)) - **decompress:** Match `extract_dir`/`extract_to` and archives ([#5983](https://github.com/ScoopInstaller/Scoop/issues/5983)) - **json:** Serialize jsonpath return ([#5921](https://github.com/ScoopInstaller/Scoop/issues/5921)) - **shim:** Restore original path for JAR cmd ([#6030](https://github.com/ScoopInstaller/Scoop/issues/6030))