fix: Create cache directory if does not exist (#220)

Ash258 · Nov 22, 2021 · f17dd14 · f17dd14
1 parent 8175fdb
commit f17dd14
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/lib/Cache.ps1 b/lib/Cache.ps1
@@ -45,7 +45,7 @@ function Show-CachedFileList {
         $regex = $ApplicationFilter -join '|'
         if (!$ApplicationFilter) { $regex = '.*?' }
 
-        $files = Get-ChildItem -LiteralPath $SCOOP_CACHE_DIRECTORY -File | Where-Object -Property 'Name' -Match -Value "^($regex)#"
+        $files = Get-ChildItem -LiteralPath $SCOOP_CACHE_DIRECTORY -ErrorAction 'SilentlyContinue' -File | Where-Object -Property 'Name' -Match -Value "^($regex)#"
         $totalSize = [double] ($files | Measure-Object -Property 'Length' -Sum).Sum
 
         $_app = @{ 'Expression' = { "$($_.app) ($($_.version))" } }

diff --git a/lib/install.ps1 b/lib/install.ps1
@@ -601,6 +601,12 @@ function dl_urls($app, $version, $manifest, $bucket, $architecture, $dir, $use_c
     $extract_tos = @(extract_to $manifest $architecture)
     $extracted = 0
 
+    try {
+        Confirm-DirectoryExistence -LiteralPath $SCOOP_CACHE_DIRECTORY | Out-Null
+    } catch {
+        throw [ScoopException] "Could not create cache directory: '$SCOOP_CACHE_DIRECTORY'"
+    }
+
     # Download first
     if (Test-Aria2Enabled) {
         dl_with_cache_aria2 $app $version $manifest $architecture $dir $cookies $use_cache $check_hash

diff --git a/libexec/scoop-download.ps1 b/libexec/scoop-download.ps1
@@ -42,6 +42,12 @@ if ($opt.b -or $opt.'all-architectures') { $Architecture = $SHOVEL_SUPPORTED_ARC
 $exitCode = 0
 $problems = 0
 
+try {
+    Confirm-DirectoryExistence -LiteralPath $SCOOP_CACHE_DIRECTORY | Out-Null
+} catch {
+    Stop-ScoopExecution -Message "Could not create cache directory: '$SCOOP_CACHE_DIRECTORY' ($($_.Exception.Message))"
+}
+
 foreach ($app in $application) {
     $resolved = $null
     try {