opt(core): Get rid of 'fullpath'

Co-Authored-By: Jakub Čábera <cabera.jakub@gmail.com>

Author: niheaven

bin/checkhashes.ps1

@@ -115,7 +115,7 @@ foreach ($current in $MANIFESTS) {
 
         dl_with_cache $current.app $version $_ $null $null -use_cache:$UseCache
 
-        $to_check = fullpath (cache_path $current.app $version $_)
+        $to_check = cache_path $current.app $version $_
         $actual_hash = compute_hash $to_check $algorithm
 
         # Append type of algorithm to both expected and actual if it's not sha256
@@ -140,7 +140,7 @@ foreach ($current in $MANIFESTS) {
         Write-Host "$($current.app): " -NoNewline
         Write-Host 'Mismatch found ' -ForegroundColor Red
         $mismatched | ForEach-Object {
-            $file = fullpath (cache_path $current.app $version $current.urls[$_])
+            $file = cache_path $current.app $version $current.urls[$_]
             Write-Host  "`tURL:`t`t$($current.urls[$_])"
             if (Test-Path $file) {
                 Write-Host  "`tFirst bytes:`t$((get_magic_bytes_pretty $file ' ').ToUpper())"

lib/autoupdate.ps1

@@ -274,7 +274,7 @@ function get_hash_for_app([String] $app, $config, [String] $version, [String] $u
         write-host -f darkred "URL $url is not valid"
         return $null
     }
-    $file = fullpath (cache_path $app $version $url)
+    $file = cache_path $app $version $url
     $hash = compute_hash $file 'sha256'
     write-host -f DarkYellow 'Computed hash: ' -NoNewline
     write-host -f Green $hash

lib/core.ps1

@@ -352,8 +352,12 @@ function url_remote_filename($url) {
 }
 
 function ensure($dir) { if(!(test-path $dir)) { mkdir $dir > $null }; resolve-path $dir }
-function fullpath($path) { # should be ~ rooted
-    $executionContext.sessionState.path.getUnresolvedProviderPathFromPSPath($path)
+function Get-AbsolutePath {
+    param (
+        [String]
+        $Path
+    ) # should be ~ rooted
+    return $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath($Path)
 }
 function relpath($path) { "$($myinvocation.psscriptroot)\$path" } # relative to calling script
 function friendly_path($path) {
@@ -615,7 +619,6 @@ function search_in_path($target) {
 
 function ensure_in_path($dir, $global) {
     $path = env 'PATH' $global
-    $dir = fullpath $dir
     if($path -notmatch [regex]::escape($dir)) {
         write-output "Adding $(friendly_path $dir) to $(if($global){'global'}else{'your'}) path."
 
@@ -678,8 +681,6 @@ function strip_path($orig_path, $dir) {
 }
 
 function remove_from_path($dir,$global) {
-    $dir = fullpath $dir
-
     # future sessions
     $was_in_path, $newpath = strip_path (env 'path' $global) $dir
     if($was_in_path) {
@@ -936,16 +937,19 @@ Optimize-SecurityProtocol
 
 # Scoop root directory
 $scoopdir = $env:SCOOP, (get_config 'rootPath'), "$env:USERPROFILE\scoop" | Where-Object { -not [String]::IsNullOrEmpty($_) } | Select-Object -First 1
+$scoopdir = Get-AbsolutePath -Path $scoopdir
 
 # Scoop global apps directory
 $globaldir = $env:SCOOP_GLOBAL, (get_config 'globalPath'), "$env:ProgramData\scoop" | Where-Object { -not [String]::IsNullOrEmpty($_) } | Select-Object -first 1
+$globaldir = Get-AbsolutePath -Path $globaldir
 
 # Scoop cache directory
 # Note: Setting the SCOOP_CACHE environment variable to use a shared directory
 #       is experimental and untested. There may be concurrency issues when
 #       multiple users write and access cached files at the same time.
 #       Use at your own risk.
 $cachedir = $env:SCOOP_CACHE, (get_config 'cachePath'), "$scoopdir\cache" | Where-Object { -not [String]::IsNullOrEmpty($_) } | Select-Object -first 1
+$cachedir = Get-AbsolutePath -Path $cachedir
 
 # Scoop config file migration
 $configHome = $env:XDG_CONFIG_HOME, "$env:USERPROFILE\.config" | Select-Object -First 1

lib/install.ps1

@@ -104,7 +104,7 @@ function Find-Manifest($app, $bucket) {
 }
 
 function dl_with_cache($app, $version, $url, $to, $cookies = $null, $use_cache = $true) {
-    $cached = fullpath (cache_path $app $version $url)
+    $cached = cache_path $app $version $url
 
     if(!(test-path $cached) -or !$use_cache) {
         ensure $cachedir | Out-Null
@@ -254,7 +254,7 @@ function dl_with_cache_aria2($app, $version, $manifest, $architecture, $dir, $co
             'filename' = url_filename $url
             'target' = "$dir\$(url_filename $url)"
             'cachename' = fname (cache_path $app $version $url)
-            'source' = fullpath (cache_path $app $version $url)
+            'source' = cache_path $app $version $url
         }
 
         if(!(test-path $data.$url.source)) {
@@ -575,8 +575,6 @@ function cookie_header($cookies) {
 }
 
 function is_in_dir($dir, $check) {
-    $check = "$(fullpath $check)"
-    $dir = "$(fullpath $dir)"
     $check -match "^$([regex]::escape("$dir"))(\\|`$)"
 }
 
@@ -602,7 +600,6 @@ function hash_for_url($manifest, $url, $arch) {
 
 # returns (ok, err)
 function check_hash($file, $hash, $app_name) {
-    $file = fullpath $file
     if(!$hash) {
         warn "Warning: No hash in manifest. SHA256 for '$(fname $file)' is:`n    $(compute_hash $file 'sha256')"
         return $true, $null
@@ -942,7 +939,6 @@ function env_add_path($manifest, $dir, $global) {
 }
 
 function add_first_in_path($dir, $global) {
-    $dir = fullpath $dir
 
     # future sessions
     $null, $currpath = strip_path (env 'path' $global) $dir
@@ -1097,8 +1093,8 @@ function persist_data($manifest, $original_dir, $persist_dir) {
 
             $source = $source.TrimEnd("/").TrimEnd("\\")
 
-            $source = fullpath "$dir\$source"
-            $target = fullpath "$persist_dir\$target"
+            $source = "$dir\$source"
+            $target = "$persist_dir\$target"
 
             # if we have had persist data in the store, just create link and go
             if (Test-Path $target) {

lib/manifest.ps1

@@ -2,7 +2,7 @@
 . "$psscriptroot/autoupdate.ps1"
 
 function manifest_path($app, $bucket) {
-    fullpath "$(Find-BucketDirectory $bucket)\$(sanitary_path $app).json"
+    return "$(Find-BucketDirectory $bucket)\$(sanitary_path $app).json"
 }
 
 function parse_json($path) {

lib/psmodules.ps1

@@ -49,7 +49,6 @@ function ensure_in_psmodulepath($dir, $global) {
     if(!$global -and $null -eq $path) {
         $path = "$env:USERPROFILE\Documents\WindowsPowerShell\Modules"
     }
-    $dir = fullpath $dir
     if($path -notmatch [regex]::escape($dir)) {
         write-output "Adding $(friendly_path $dir) to $(if($global){'global'}else{'your'}) PowerShell module path."
 

libexec/scoop-status.ps1

@@ -11,7 +11,7 @@
 reset_aliases
 
 # check if scoop needs updating
-$currentdir = fullpath $(versiondir 'scoop' 'current')
+$currentdir = versiondir 'scoop' 'current'
 $needs_update = $false
 
 if(test-path "$currentdir\.git") {

libexec/scoop-update.ps1

@@ -73,9 +73,9 @@ function update_scoop() {
     if ($null -eq $last_update) {$last_update = [System.DateTime]::Now}
     $last_update = $last_update.ToString('s')
     $show_update_log = get_config 'show_update_log' $true
-    $currentdir = fullpath $(versiondir 'scoop' 'current')
+    $currentdir = versiondir 'scoop' 'current'
     if (!(test-path "$currentdir\.git")) {
-        $newdir = fullpath $(versiondir 'scoop' 'new')
+        $newdir = versiondir 'scoop' 'new'
 
         # get git scoop
         git_clone -q $configRepo --branch $configBranch --single-branch "`"$newdir`""
@@ -214,7 +214,7 @@ function update($app, $global, $quiet = $false, $independent, $suggested, $use_c
 
             if ($check_hash) {
                 $manifest_hash = hash_for_url $manifest $url $architecture
-                $source = fullpath (cache_path $app $version $url)
+                $source = cache_path $app $version $url
                 $ok, $err = check_hash $source $manifest_hash $(show_app $app $bucket)
 
                 if (!$ok) {

libexec/scoop-which.ps1

@@ -17,7 +17,7 @@ try {
 
 $path = "$($gcm.path)"
 $usershims = "$(resolve-path $(shimdir $false))"
-$globalshims = fullpath (shimdir $true) # don't resolve: may not exist
+$globalshims = shimdir $true
 
 if($path.endswith(".ps1") -and ($path -like "$usershims*" -or $path -like "$globalshims*")) {
     $shimtext = Get-Content $path

test/Scoop-Install.Tests.ps1

@@ -70,7 +70,6 @@ describe "is_in_dir" -Tag 'Scoop' {
         is_in_dir "C:\test" "C:\foo" | should -BeFalse
         is_in_dir "C:\test" "C:\test\foo\baz.zip" | should -betrue
 
-        is_in_dir "test" "$psscriptroot" | should -betrue
         is_in_dir "$psscriptroot\..\" "$psscriptroot" | should -BeFalse
     }
 }