fix(core): Use 'Join-Path' to construct cache file path (#6079)

ScoopInstaller · Jul 25, 2024 · 46624b0 · 46624b0
1 parent 49ee8ad
commit 46624b0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - **scoop-alias:** Fix 'Option --verbose not recognized.' ([#6062](https://github.com/ScoopInstaller/Scoop/issues/6062))
 - **scoop-hold:** Use 'foreach' loop to allow 'continue' statement ([#6078](https://github.com/ScoopInstaller/Scoop/issues/6078))
+- **core:** Use 'Join-Path' to construct cache file path ([#6079](https://github.com/ScoopInstaller/Scoop/issues/6079))
 - **json:** Don't serialize jsonpath return if only one result ([#6066](https://github.com/ScoopInstaller/Scoop/issues/6066), [#6073](https://github.com/ScoopInstaller/Scoop/issues/6073))
 
 ### Builds

diff --git a/lib/core.ps1 b/lib/core.ps1
@@ -407,7 +407,7 @@ function usermanifestsdir { "$(basedir)\workspace" }
 function usermanifest($app) { "$(usermanifestsdir)\$app.json" }
 function cache_path($app, $version, $url) {
     $underscoredUrl = $url -replace '[^\w\.\-]+', '_'
-    $filePath = "$cachedir\$app#$version#$underscoredUrl"
+    $filePath = Join-Path $cachedir "$app#$version#$underscoredUrl"
 
     # NOTE: Scoop cache files migration. Remove this 6 months after the feature ships.
     if (Test-Path $filePath) {

diff --git a/lib/install.ps1 b/lib/install.ps1
@@ -238,7 +238,7 @@ function Invoke-CachedAria2Download ($app, $version, $manifest, $architecture, $
 
     foreach ($url in $urls) {
         $data.$url = @{
-            'target'    = "$dir\$(url_filename $url)"
+            'target'    = Join-Path $dir (url_filename $url)
             'cachename' = fname (cache_path $app $version $url)
             'source'    = cache_path $app $version $url
         }