From c9ad0eb19bb67b00705446514ff1b223d0a22626 Mon Sep 17 00:00:00 2001 From: HUMORCE Date: Sun, 18 Jun 2023 14:27:06 +0000 Subject: [PATCH 1/4] fix(core): Use relative path as fallback of `$scoopdir`(Scoop root directory) --- lib/core.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/core.ps1 b/lib/core.ps1 index 3b66654b97..c1d2ff0343 100644 --- a/lib/core.ps1 +++ b/lib/core.ps1 @@ -1382,7 +1382,7 @@ if ($scoopConfig -and $scoopConfig.PSObject.Properties.Name -contains 'lastUpdat # END NOTE # Scoop root directory -$scoopdir = $env:SCOOP, (get_config ROOT_PATH), "$([System.Environment]::GetFolderPath('UserProfile'))\scoop" | Where-Object { -not [String]::IsNullOrEmpty($_) } | Select-Object -First 1 +$scoopdir = $env:SCOOP, (get_config ROOT_PATH), (Resolve-Path "$PSScriptRoot\..\..\..\..)") | Where-Object { -not [String]::IsNullOrEmpty($_) } | Select-Object -First 1 # Scoop global apps directory $globaldir = $env:SCOOP_GLOBAL, (get_config GLOBAL_PATH), "$([System.Environment]::GetFolderPath('CommonApplicationData'))\scoop" | Where-Object { -not [String]::IsNullOrEmpty($_) } | Select-Object -First 1 From 57c6e88b6be169751c7020f7ef9267ee6b08e8d5 Mon Sep 17 00:00:00 2001 From: HUMORCE Date: Sun, 18 Jun 2023 14:35:56 +0000 Subject: [PATCH 2/4] typo --- lib/core.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/core.ps1 b/lib/core.ps1 index c1d2ff0343..d03975f473 100644 --- a/lib/core.ps1 +++ b/lib/core.ps1 @@ -1382,7 +1382,7 @@ if ($scoopConfig -and $scoopConfig.PSObject.Properties.Name -contains 'lastUpdat # END NOTE # Scoop root directory -$scoopdir = $env:SCOOP, (get_config ROOT_PATH), (Resolve-Path "$PSScriptRoot\..\..\..\..)") | Where-Object { -not [String]::IsNullOrEmpty($_) } | Select-Object -First 1 +$scoopdir = $env:SCOOP, (get_config ROOT_PATH), (Resolve-Path "$PSScriptRoot\..\..\..\..") | Where-Object { -not [String]::IsNullOrEmpty($_) } | Select-Object -First 1 # Scoop global apps directory $globaldir = $env:SCOOP_GLOBAL, (get_config GLOBAL_PATH), "$([System.Environment]::GetFolderPath('CommonApplicationData'))\scoop" | Where-Object { -not [String]::IsNullOrEmpty($_) } | Select-Object -First 1 From 499f6157c72829a307bbf097e12b4e4140631c97 Mon Sep 17 00:00:00 2001 From: HUMORCE Date: Sun, 18 Jun 2023 14:43:37 +0000 Subject: [PATCH 3/4] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bcc94c162..8da8c40a00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ - **scoop-info:** Fix errors in file size collection when `--verbose` ([#5352](https://github.com/ScoopInstaller/Scoop/pull/5352)) - **shim:** Use bash executable directly ([#5433](https://github.com/ScoopInstaller/Scoop/issues/5433)) - **scoop-checkup:** Skip defender check in Windows Sandbox ([#5519]https://github.com/ScoopInstaller/Scoop/issues/5519) +- **core:** Use relative path as fallback of `$scoopdir` ([#5544]https://github.com/ScoopInstaller/Scoop/issues/5544) ### Performance Improvements From 6ade28e60e1450de793772c0beffd4f0ed1b3f2a Mon Sep 17 00:00:00 2001 From: HUMORCE Date: Sun, 18 Jun 2023 15:18:25 +0000 Subject: [PATCH 4/4] re --- lib/core.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/core.ps1 b/lib/core.ps1 index d03975f473..4b299656bd 100644 --- a/lib/core.ps1 +++ b/lib/core.ps1 @@ -1382,7 +1382,7 @@ if ($scoopConfig -and $scoopConfig.PSObject.Properties.Name -contains 'lastUpdat # END NOTE # Scoop root directory -$scoopdir = $env:SCOOP, (get_config ROOT_PATH), (Resolve-Path "$PSScriptRoot\..\..\..\..") | Where-Object { -not [String]::IsNullOrEmpty($_) } | Select-Object -First 1 +$scoopdir = $env:SCOOP, (get_config ROOT_PATH), (Resolve-Path "$PSScriptRoot\..\..\..\.."), "$([System.Environment]::GetFolderPath('UserProfile'))\scoop" | Where-Object { -not [String]::IsNullOrEmpty($_) } | Select-Object -First 1 # Scoop global apps directory $globaldir = $env:SCOOP_GLOBAL, (get_config GLOBAL_PATH), "$([System.Environment]::GetFolderPath('CommonApplicationData'))\scoop" | Where-Object { -not [String]::IsNullOrEmpty($_) } | Select-Object -First 1