fix(buckets): Avoid error messages for unexpected dir

ScoopInstaller · Jun 20, 2023 · 9b8ae95 · 9b8ae95
1 parent 1d14058
commit 9b8ae95
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/buckets.ps1 b/lib/buckets.ps1
@@ -111,7 +111,7 @@ function list_buckets {
             $bucket.Updated = Invoke-Git -Path $path -ArgumentList @('log', '--format=%aD', '-n', '1') | Get-Date
         } else {
             $bucket.Source = friendly_path $path
-            $bucket.Updated = (Get-Item "$path\bucket").LastWriteTime
+            $bucket.Updated = (Get-Item "$path\bucket" -ErrorAction SilentlyContinue).LastWriteTime
         }
         $bucket.Manifests = Get-ChildItem "$path\bucket" -Force -Recurse -ErrorAction SilentlyContinue |
                 Measure-Object | Select-Object -ExpandProperty Count

diff --git a/lib/core.ps1 b/lib/core.ps1
@@ -529,9 +529,11 @@ function fullpath($path) {
     $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath($path)
 }
 function friendly_path($path) {
-    $h = (Get-PsProvider 'FileSystem').home; if(!$h.endswith('\')) { $h += '\' }
-    if($h -eq '\') { return $path }
-    return "$path" -replace ([regex]::escape($h)), "~\"
+    $h = $([System.Environment]::GetFolderPath('UserProfile'))
+    if ($h -eq '\') { return $path }
+    $p = $path.Replace($h, '~')
+    if ($p -eq '~') { return '~\' }
+    return "$p"
 }
 function is_local($path) {
     ($path -notmatch '^https?://') -and (test-path $path)