Ash258 · Ash258 · Jul 17, 2021 · Jul 15, 2021 · Jul 16, 2021 · Jul 16, 2021
diff --git a/bin/update-supporting.ps1 b/bin/update-supporting.ps1
@@ -48,11 +48,8 @@ foreach ($sup in $Sups) {
         Invoke-ManifestScript -Manifest $manifest -ScriptName 'pre_install' -Architecture $architecture
     } catch {
         ++$problems
-
-        $title, $body = $_.Exception.Message -split '\|-'
-        if (!$body) { $body = $title }
-        Write-UserMessage -Message $body -Err
         debug $_.InvocationInfo
+        New-IssuePromptFromException -ExceptionMessage $_.Exception.Message
 
         continue
     }

diff --git a/lib/Helpers.ps1 b/lib/Helpers.ps1
@@ -318,6 +318,7 @@ function New-IssuePrompt {
     param([String] $Application, [String] $Bucket, [String] $Title, [String[]] $Body)
 
     $Bucket = $Bucket.Trim()
+    # TODO: Adopt-ManifestResolveInformation
     $app, $manifest, $Bucket, $url = Find-Manifest $Application $Bucket
     $url = known_bucket_repo $Bucket
     $bucketPath = Join-Path $SCOOP_BUCKETS_DIRECTORY $Bucket
@@ -357,6 +358,27 @@ function New-IssuePrompt {
     Write-UserMessage -Message "$msg`n$url" -Color 'DarkRed'
 }
 
+function New-IssuePromptFromException {
+    <#
+    .SYNOPSIS
+        Wrapper for handling <Title>|-<Body> exception messages with support for promping user with according link to create a new issue.
+    #>
+    param(
+        [String] $ExceptionMessage,
+        [AllowNull()]
+        [String] $Application,
+        [AllowNull()]
+        [String] $Bucket
+    )
+
+    process {
+        $title, $body = $ExceptionMessage -split '\|-'
+        if (!$body) { $body = $title }
+        if ($body -ne 'Ignore') { Write-UserMessage -Message $body -Err }
+        if ($title -ne 'Ignore' -and ($title -ne $body)) { New-IssuePrompt -Application $Application -Bucket $Bucket -Title $title -Body $body }
+    }
+}
+
 function Get-NotePropertyEnumerator {
     <#
     .SYNOPSIS

diff --git a/lib/Update.ps1 b/lib/Update.ps1
@@ -240,15 +240,13 @@ function Update-App {
 
     # TODO: Could this ever happen?
     if (!$Force -and ($oldVersion -eq $version)) {
-        if (!$quiet) { Write-UserMessage -Message "The Latest version of '$App' ($version) is already installed." -Warning }
-        return
+        throw [ScoopException] "The Latest version of '$App' ($version) is already installed." # TerminatingError thrown
     }
 
     # TODO:???
     # TODO: Case when bucket no longer have this application?
     if (!$version) {
-        Write-UserMessage -Message "No manifest available for '$App'" -Err
-        return
+        throw [ScoopException] "No manifest available for '$App'" # TerminatingError thrown
     }
 
     $manifest = manifest $App $bucket $url
@@ -291,7 +289,7 @@ function Update-App {
     #endregion Workaround of #2220
 
     $result = Uninstall-ScoopApplication -App $App -Global:$Global
-    if ($result -eq $false) { return }
+    if ($result -eq $false) { throw [ScoopException] 'Ignore' }
 
     # Rename current version to .old if same version is installed
     if ($Force -and ($oldVersion -eq $version)) {
@@ -307,6 +305,7 @@ function Update-App {
         }
     }
 
+    # TODO: Adopt Resolve-ManifestInformation???
     $toUpdate = if ($install.url) { $install.url } else { "$bucket/$App" }
 
     # Error catching should be handled on upper scope

diff --git a/libexec/scoop-cat.ps1 b/libexec/scoop-cat.ps1
@@ -25,11 +25,8 @@ foreach ($app in $Applications) {
         $resolved = Resolve-ManifestInformation -ApplicationQuery $app
     } catch {
         ++$Problems
-
-        $title, $body = $_.Exception.Message -split '\|-'
-        if (!$body) { $body = $title }
-        Write-UserMessage -Message $body -Err
         debug $_.InvocationInfo
+        New-IssuePromptFromException -ExceptionMessage $_.Exception.Message
 
         continue
     }

diff --git a/libexec/scoop-download.ps1 b/libexec/scoop-download.ps1
@@ -40,11 +40,8 @@ foreach ($app in $application) {
         $resolved = Resolve-ManifestInformation -ApplicationQuery $app
     } catch {
         ++$problems
-
-        $title, $body = $_.Exception.Message -split '\|-'
-        if (!$body) { $body = $title }
-        Write-UserMessage -Message $body -Err
         debug $_.InvocationInfo
+        New-IssuePromptFromException -ExceptionMessage $_.Exception.Message
 
         continue
     }
@@ -77,11 +74,8 @@ foreach ($app in $application) {
                         ++$problems
                     }
 
-                    $title, $body = $_.Exception.Message -split '\|-'
-                    if (!$body) { $body = $title }
-                    Write-UserMessage -Message $body -Err
                     debug $_.InvocationInfo
-                    if ($title -ne 'Ignore' -and ($title -ne $body)) { New-IssuePrompt -Application $appName -Bucket $bucket -Title $title -Body $body }
+                    New-IssuePromptFromException -ExceptionMessage $_.Exception.Message -Application $appName -Bucket $bucket
 
                     continue
                 }
@@ -115,11 +109,8 @@ foreach ($app in $application) {
                             ++$problems
                         }
 
-                        $title, $body = $_.Exception.Message -split '\|-'
-                        if (!$body) { $body = $title }
-                        Write-UserMessage -Message $body -Err
                         debug $_.InvocationInfo
-                        if ($title -ne 'Ignore' -and ($title -ne $body)) { New-IssuePrompt -Application $appName -Bucket $bucket -Title $title -Body $body }
+                        New-IssuePromptFromException -ExceptionMessage $_.Exception.Message -Application $appName -Bucket $bucket
 
                         continue
                     }

diff --git a/libexec/scoop-home.ps1 b/libexec/scoop-home.ps1
@@ -24,10 +24,8 @@ $resolved = $null
 try {
     $resolved = Resolve-ManifestInformation -ApplicationQuery $Application
 } catch {
-    $title, $body = $_.Exception.Message -split '\|-'
-    if (!$body) { $body = $title }
-    Write-UserMessage -Message $body -Err
     debug $_.InvocationInfo
+    New-IssuePromptFromException -ExceptionMessage $_.Exception.Message
 
     $ExitCode = 3
 }

diff --git a/libexec/scoop-install.ps1 b/libexec/scoop-install.ps1
@@ -117,11 +117,7 @@ if (!$independent) {
     try {
         $apps = install_order $apps $architecture # Add dependencies
     } catch {
-        $title, $body = $_.Exception.Message -split '\|-'
-        Write-UserMessage -Message $body -Err
-        if ($title -ne 'Ignore') {
-            New-IssuePrompt -Application $app -Title $title -Body $body
-        }
+        New-IssuePromptFromException -ExceptionMessage $_.Exception.Message
     }
 }
 
@@ -156,6 +152,7 @@ foreach ($app in $apps) {
         continue
     }
 
+    # TODO: Resolve-ManifestInformation
     $cleanApp, $bucket = parse_app $app
 
     # Prevent checking of already installed applications if specific version was provided.
@@ -178,20 +175,24 @@ foreach ($app in $apps) {
         # Register failed dependencies
         if ($explicit_apps -notcontains $app) { $failedDependencies += $app } else { $failedApplications += $app }
 
-        $title, $body = $_.Exception.Message -split '\|-'
-        if (!$body) { $body = $title }
-        Write-UserMessage -Message $body -Err
         debug $_.InvocationInfo
-        if ($title -ne 'Ignore' -and ($title -ne $body)) { New-IssuePrompt -Application $cleanApp -Bucket $bucket -Title $title -Body $body }
+        New-IssuePromptFromException -ExceptionMessage $_.Exception.Message -Application $cleanApp -Bucket $bucket
 
         continue
     }
 }
 
 show_suggestions $suggested
 
-if ($failedApplications) { Write-UserMessage -Message "These applications failed to install: $($failedApplications -join ', ')" -Err }
-if ($failedDependencies) { Write-UserMessage -Message "These dependencies failed to install: $($failedDependencies -join ', ')" -Err }
+if ($failedApplications) {
+    $pl = pluralize $failedApplications.Count 'This application' 'These applications'
+    Write-UserMessage -Message "$pl failed to install: $($failedApplications -join ', ')" -Err
+}
+
+if ($failedDependencies) {
+    $pl = pluralize $failedDependencies.Count 'This dependency' 'These dependencies'
+    Write-UserMessage -Message "$pl failed to install: $($failedDependencies -join ', ')" -Err
+}
 
 if ($problems -gt 0) { $exitCode = 10 + $problems }
 

diff --git a/libexec/scoop-uninstall.ps1 b/libexec/scoop-uninstall.ps1
@@ -44,12 +44,8 @@ foreach ($explode in $Applications) {
         $result = Uninstall-ScoopApplication -App $app -Global:$gl -Purge:$Purge -Older
     } catch {
         ++$Problems
-
-        $title, $body = $_.Exception.Message -split '\|-'
-        if (!$body) { $body = $title }
-        Write-UserMessage -Message $body -Err
         debug $_.InvocationInfo
-        if ($title -ne 'Ignore' -and ($title -ne $body)) { New-IssuePrompt -Application $app -Bucket $bucket -Title $title -Body $body }
+        New-IssuePromptFromException -ExceptionMessage $_.Exception.Message -Application $app -Bucket $bucket
 
         continue
     }

diff --git a/libexec/scoop-update.ps1 b/libexec/scoop-update.ps1
@@ -87,21 +87,17 @@ if (!$Applications) {
             Update-App -App $out[0] -Global:$out[1] -Suggested @{ } -Quiet:$Quiet -Independent:$Independent -SkipCache:(!$UseCache) -SkipHashCheck:(!$CheckHash)
         } catch {
             ++$Problems
-
             $failedApplications += $out[0]
-
-            $title, $body = $_.Exception.Message -split '\|-'
-            if (!$body) { $body = $title }
-            Write-UserMessage -Message $body -Err
             debug $_.InvocationInfo
-            if ($title -ne 'Ignore' -and ($title -ne $body)) { New-IssuePrompt -Application $out[0] -Bucket $out[2] -Title $title -Body $body }
-
-            continue
+            New-IssuePromptFromException -ExceptionMessage $_.Exception.Message -Application $out[0] -Bucket $out[2]
         }
     }
 }
 
-if ($failedApplications) { Write-UserMessage -Message "These applications failed to update: $($failedApplications -join ', ')" -Err }
+if ($failedApplications) {
+    $pl = pluralize $failedApplications.Count 'This application' 'These applications'
+    Write-UserMessage -Message "$pl failed to update: $($failedApplications -join ', ')" -Err
+}
 
 if ($Problems -gt 0) { $ExitCode = 10 + $Problems }