refactor(path): Use 'Convert-Path()' instead of 'Resolve-Path()'

CHANGELOG.md

@@ -11,6 +11,10 @@
 
 - **config:** Change config option to snake_case in file and SCREAMING_CASE in code ([#5116](https://github.com/ScoopInstaller/Scoop/issues/5116))
 
+### Code Refactoring
+
+- **path:** Use 'Convert-Path()' instead of 'Resolve-Path()' ([#5109](https://github.com/ScoopInstaller/Scoop/issues/5109))
+
 ### Builds
 
 - **schema**: Set manifest schema to be stricter ([#5093](https://github.com/ScoopInstaller/Scoop/issues/5093))

bin/auto-pr.ps1

@@ -66,7 +66,7 @@ param(
 if ($App -ne '*' -and (Test-Path $App -PathType Leaf)) {
     $Dir = Split-Path $App
 } elseif ($Dir) {
-    $Dir = Resolve-Path $Dir
+    $Dir = Convert-Path $Dir
 } else {
     throw "'-Dir' parameter required if '-App' is not a filepath!"
 }

bin/checkhashes.ps1

@@ -49,7 +49,7 @@ param(
 . "$PSScriptRoot\..\lib\install.ps1"
 . "$PSScriptRoot\..\lib\unix.ps1"
 
-$Dir = Resolve-Path $Dir
+$Dir = Convert-Path $Dir
 if ($ForceUpdate) { $Update = $true }
 # Cleanup
 if (!$UseCache) { Remove-Item "$cachedir\*HASH_CHECK*" -Force }
@@ -174,7 +174,7 @@ foreach ($current in $MANIFESTS) {
         Write-Host "Writing updated $($current.app) manifest" -ForegroundColor DarkGreen
 
         $current.manifest = $current.manifest | ConvertToPrettyJson
-        $path = Resolve-Path "$Dir\$($current.app).json"
+        $path = Convert-Path "$Dir\$($current.app).json"
         [System.IO.File]::WriteAllLines($path, $current.manifest)
     }
 }

bin/checkurls.ps1

@@ -30,7 +30,7 @@ param(
 . "$PSScriptRoot\..\lib\manifest.ps1"
 . "$PSScriptRoot\..\lib\install.ps1"
 
-$Dir = Resolve-Path $Dir
+$Dir = Convert-Path $Dir
 $Queue = @()
 
 Get-ChildItem $Dir "$App.json" | ForEach-Object {

bin/checkver.ps1

@@ -80,7 +80,7 @@ if ($App -ne '*' -and (Test-Path $App -PathType Leaf)) {
     $Dir = Split-Path $App
     $files = Get-ChildItem $Dir (Split-Path $App -Leaf)
 } elseif ($Dir) {
-    $Dir = Resolve-Path $Dir
+    $Dir = Convert-Path $Dir
     $files = Get-ChildItem $Dir "$App.json"
 } else {
     throw "'-Dir' parameter required if '-App' is not a filepath!"

bin/describe.ps1

@@ -24,7 +24,7 @@ param(
 . "$PSScriptRoot\..\lib\manifest.ps1"
 . "$PSScriptRoot\..\lib\description.ps1"
 
-$Dir = Resolve-Path $Dir
+$Dir = Convert-Path $Dir
 $Queue = @()
 
 Get-ChildItem $Dir "$App.json" | ForEach-Object {

bin/formatjson.ps1

@@ -31,7 +31,7 @@ param(
 . "$PSScriptRoot\..\lib\manifest.ps1"
 . "$PSScriptRoot\..\lib\json.ps1"
 
-$Dir = Resolve-Path $Dir
+$Dir = Convert-Path $Dir
 
 Get-ChildItem $Dir "$App.json" | ForEach-Object {
     if ($PSVersionTable.PSVersion.Major -gt 5) { $_ = $_.Name } # Fix for pwsh

bin/missing-checkver.ps1

@@ -26,7 +26,7 @@ param(
 . "$PSScriptRoot\..\lib\core.ps1"
 . "$PSScriptRoot\..\lib\manifest.ps1"
 
-$Dir = Resolve-Path $Dir
+$Dir = Convert-Path $Dir
 
 Write-Host '[' -NoNewLine
 Write-Host 'C' -NoNewLine -ForegroundColor Green

lib/core.ps1

@@ -717,7 +717,7 @@ function shim($path, $global, $name, $arg) {
     Push-Location $abs_shimdir
     $relative_path = Resolve-Path -Relative $path
     Pop-Location
-    $resolved_path = Resolve-Path $path
+    $resolved_path = Convert-Path $path
 
     if ($path -match '\.(exe|com)$') {
         # for programs with no awareness of any shell

lib/manifest.ps1

@@ -147,8 +147,8 @@ function generate_user_manifest($app, $bucket, $version) {
 
     ensure $(usermanifestsdir) | out-null
     try {
-        Invoke-AutoUpdate $app "$(resolve-path $(usermanifestsdir))" $manifest $version $(@{ })
-        return "$(resolve-path $(usermanifest $app))"
+        Invoke-AutoUpdate $app "$(Convert-Path (usermanifestsdir))" $manifest $version $(@{ })
+        return "$(Convert-Path (usermanifest $app))"
     } catch {
         write-host -f darkred "Could not install $app@$version"
     }

lib/psmodules.ps1

@@ -39,7 +39,7 @@ function uninstall_psmodule($manifest, $dir, $global) {
     $linkfrom = "$modulesdir\$module_name"
     if (Test-Path $linkfrom) {
         Write-Host "Removing $(friendly_path $linkfrom)"
-        $linkfrom = Resolve-Path $linkfrom
+        $linkfrom = Convert-Path $linkfrom
         Remove-Item -Path $linkfrom -Force -ErrorAction SilentlyContinue
     }
 }

lib/unix.ps1

@@ -17,7 +17,7 @@ $cachedir = $env:SCOOP_CACHE, (get_config 'CACHE_PATH'), (Join-Path $scoopdir 'c
 # core.ps1
 function ensure($dir) {
     mkdir -p $dir > $null
-    return resolve-path $dir
+    return Convert-Path $dir
 }
 
 # install.ps1

libexec/scoop-reset.ps1

@@ -63,7 +63,7 @@ $apps | ForEach-Object {
 
     write-host "Resetting $app ($version)."
 
-    $dir = resolve-path (versiondir $app $version $global)
+    $dir = Convert-Path (versiondir $app $version $global)
     $original_dir = $dir
     $persist_dir = persistdir $app $global
 

test/bin/test.ps1

@@ -3,7 +3,7 @@
 #Requires -Modules @{ ModuleName = 'Pester'; MaximumVersion = '4.99' }
 #Requires -Modules @{ ModuleName = 'PSScriptAnalyzer'; ModuleVersion = '1.17.1' }
 param(
-    [String] $TestPath = $(Resolve-Path "$PSScriptRoot\..\")
+    [String] $TestPath = $(Convert-Path "$PSScriptRoot\..\")
 )
 
 $splat = @{
@@ -21,7 +21,7 @@ if ($env:CI -eq $true) {
     $commitMessage = $env:BHCommitMessage
 
     # Check if tests are called from the Core itself, if so, adding excludes
-    if ($TestPath -eq $(Resolve-Path "$PSScriptRoot\..\")) {
+    if ($TestPath -eq $(Convert-Path "$PSScriptRoot\..\")) {
         if ($commitMessage -match '!linter') {
             Write-Warning "Skipping code linting per commit flag '!linter'"
             $excludes += 'Linter'