Clean up some error messages (ScoopInstaller#2032)

Removes extra 'ERROR' in text where the `error` method is used. Converts some `write-host "error message"` to use the `error` method Converts some `write-host "error message"; exit 1` to use the `abort` method.
CyberFlameGO · Mar 12, 2018 · 31075f6 · 31075f6
1 parent 018a19d
commit 31075f6
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 17 deletions.
diff --git a/bin/auto-pr.ps1 b/bin/auto-pr.ps1
@@ -53,17 +53,15 @@ if ((!$push -and !$request) -or $help) {
 }
 
 if(!($upstream -match "^(.*)\/(.*):(.*)$")) {
-    Write-Host -f DarkRed "Upstream must have this format: <user>/<repo>:<branch>"
-    exit 1
+    abort "Upstream must have this format: <user>/<repo>:<branch>"
 }
 
 function execute($cmd) {
     Write-Host -f Green $cmd
     $output = Invoke-Expression $cmd
 
     if($LASTEXITCODE -gt 0) {
-        Write-Host -f Red "^^^ Error! See above ^^^ (last command: $cmd)"
-        exit 1
+        abort "^^^ Error! See above ^^^ (last command: $cmd)"
     }
     return $output
 }
@@ -91,7 +89,7 @@ function pull_requests($json, [String]$app, [String]$upstream, [String]$manifest
     execute "hub push origin $branch"
 
     if($LASTEXITCODE -gt 0) {
-        Write-Host -f DarkRed "Push failed! (hub push origin $branch)"
+        error "Push failed! (hub push origin $branch)"
         execute "hub reset"
         return
     }
@@ -107,9 +105,8 @@ function pull_requests($json, [String]$app, [String]$upstream, [String]$manifest
     $msg += "</table>"
     hub pull-request -m "$msg" -b '$upstream' -h '$branch'
     if($LASTEXITCODE -gt 0) {
-        Write-Host -f DarkRed "Pull Request failed! (hub pull-request -m 'Update $app to version $version' -b '$upstream' -h '$branch')"
         execute "hub reset"
-        exit 1
+        abort "Pull Request failed! (hub pull-request -m 'Update $app to version $version' -b '$upstream' -h '$branch')"
     }
 }
 
@@ -139,7 +136,7 @@ hub diff --name-only | ForEach-Object {
     $app = ([System.IO.Path]::GetFileNameWithoutExtension($manifest))
     $json = parse_json $manifest
     if(!$json.version) {
-        Write-Host -f Red "Invalid manifest: $manifest ..."
+        error "Invalid manifest: $manifest ..."
         return
     }
     $version = $json.version

diff --git a/bin/checkver.ps1 b/bin/checkver.ps1
@@ -65,7 +65,7 @@ $queue | ForEach-Object {
 
     if ($json.checkver -eq "github") {
         if (!$json.homepage.StartsWith("https://github.com/")) {
-            write-host "ERROR: $name checkver expects the homepage to be a github repository" -f DarkYellow
+            error "$name checkver expects the homepage to be a github repository"
         }
         $url = $json.homepage + "/releases/latest"
         $regex = $githubRegex

diff --git a/lib/psmodules.ps1 b/lib/psmodules.ps1
@@ -14,7 +14,6 @@ function install_psmodule($manifest, $dir, $global) {
     $module_name = $psmodule.name
     if(!$module_name) {
         abort "Invalid manifest: The 'name' property is missing from 'psmodule'."
-        return
     }
 
     $linkfrom = "$modulesdir\$module_name"

diff --git a/libexec/scoop-depends.ps1 b/libexec/scoop-depends.ps1
@@ -15,13 +15,13 @@ reset_aliases
 $opt, $apps, $err = getopt $args 'a:' 'arch='
 $app = $apps[0]
 
-if(!$app) { error 'ERROR: <app> missing'; my_usage; exit 1 }
+if(!$app) { error '<app> missing'; my_usage; exit 1 }
 
 $architecture = default_architecture
 try {
     $architecture = ensure_architecture ($opt.a + $opt.arch)
 } catch {
-    error "ERROR: $_"; exit 1
+    abort "ERROR: $_"
 }
 
 $deps = @(deps $app $architecture)

diff --git a/libexec/scoop-install.ps1 b/libexec/scoop-install.ps1
@@ -56,13 +56,13 @@ $architecture = default_architecture
 try {
     $architecture = ensure_architecture ($opt.a + $opt.arch)
 } catch {
-    error "ERROR: $_"; exit 1
+    abort "ERROR: $_"
 }
 
-if(!$apps) { error 'ERROR: <app> missing'; my_usage; exit 1 }
+if(!$apps) { error '<app> missing'; my_usage; exit 1 }
 
 if($global -and !(is_admin)) {
-    error 'ERROR: you need admin rights to install global apps'; exit 1
+    abort 'ERROR: you need admin rights to install global apps'
 }
 
 if(is_scoop_outdated) {

diff --git a/libexec/scoop-reset.ps1 b/libexec/scoop-reset.ps1
@@ -17,7 +17,7 @@ reset_aliases
 $opt, $apps, $err = getopt $args
 if($err) { "scoop reset: $err"; exit 1 }
 
-if(!$apps) { error 'ERROR: <app> missing'; my_usage; exit 1 }
+if(!$apps) { error '<app> missing'; my_usage; exit 1 }
 
 if($apps -eq '*') {
     $local = installed_apps $false | ForEach-Object { ,@($_, $false) }

diff --git a/libexec/scoop-virustotal.ps1 b/libexec/scoop-virustotal.ps1
@@ -206,7 +206,7 @@ $apps | ForEach-Object {
             }
             else {
                 if ($_.Exception.Message -match "\(204|429\)") {
-                    abort("$app`: VirusTotal request failed`: $($_.Exception.Message)", $exit_code)
+                    abort "$app`: VirusTotal request failed`: $($_.Exception.Message)" $exit_code
                 }
                 warn("$app`: VirusTotal request failed`: $($_.Exception.Message)")
             }