fix(install,download): Skip archive lookup when archive does not exist

Ash258 · Apr 15, 2021 · 254dbf2 · 254dbf2
1 parent 8b7ad0e
commit 254dbf2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/lib/manifest.ps1 b/lib/manifest.ps1
@@ -284,14 +284,14 @@ function generate_user_manifest($app, $bucket, $version) {
 
     # Seach local path
     # TODO: Export to function
-    $archivedManifest = Find-BucketDirectory -Name $bucket | Join-Path -ChildPath "old\$cleanApp" | Get-ChildItem -File
+    $archivedManifest = Find-BucketDirectory -Name $bucket | Join-Path -ChildPath "old\$cleanApp" | Get-ChildItem -ErrorAction 'SilentlyContinue' -File
     $archivedManifest = $archivedManifest | Where-Object -Property 'Name' -Match -Value "\.($ALLOWED_MANIFEST_EXTENSION_REGEX)$"
     if ($archivedManifest.Count -gt 0) {
         $archivedManifest = @($archivedManifest | Where-Object -Property 'BaseName' -EQ -Value $version)
         $archivedManifest = $archivedManifest[0]
     }
 
-    if (Test-Path $archivedManifest) {
+    if ($archivedManifest -and (Test-Path -LiteralPath $archivedManifest)) {
         $archivedManifest = Get-Item -LiteralPath $archivedManifest
         Write-UserMessage -Message 'Found archived version' -Success
 

diff --git a/libexec/scoop-download.ps1 b/libexec/scoop-download.ps1
@@ -61,9 +61,13 @@ foreach ($app in $application) {
 
     # Generate manifest if there is different version in manifest
     if (($null -ne $version) -and ($manifest.version -ne $version)) {
-        $generated = generate_user_manifest $appName $bucket $version
-        if ($null -eq $generated) {
-            Write-UserMessage -Message 'Manifest cannot be generated with provided version' -Err
+        try {
+            $generated = generate_user_manifest $appName $bucket $version
+            if ($null -eq $generated) {
+                throw [ScoopException] ''
+            }
+        } catch {
+            Write-UserMessage -Message 'Archived manifest does not exist and version specific manifest cannot be generated with provided version' -Err
             ++$problems
 
             continue