#212 Remove superfluous try/catch statements

dtgm · Jun 6, 2016 · 108dd10 · 108dd10
1 parent 37ea402
commit 108dd10
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 29 deletions.
diff --git a/automatic/i2p/tools/chocolateyUninstall.ps1 b/automatic/i2p/tools/chocolateyUninstall.ps1
@@ -36,15 +36,11 @@ $ahkExe = 'AutoHotKey'
 $ahkRun = "$Env:Temp\$(Get-Random).ahk"
 Copy-Item $ahkFile "$ahkRun" -Force
 
-try {
-  Start-Process $ahkExe $ahkRun
-  Start-ChocolateyProcessAsAdmin -Statements "$installArgs" `
-                                 -ExeToRun "java" `
-                                 -ValidExitCodes $validExitCodes
-  Remove-Item "$ahkRun" -Force
-  if (Test-Path $inPath) {
-    Remove-Item -Path $inPath -Recurse
-  }
-} catch {
-  throw
+Start-Process $ahkExe $ahkRun
+Start-ChocolateyProcessAsAdmin -Statements "$installArgs" `
+                               -ExeToRun "java" `
+                               -ValidExitCodes $validExitCodes
+Remove-Item "$ahkRun" -Force
+if (Test-Path $inPath) {
+  Remove-Item -Path $inPath -Recurse
 }
diff --git a/automatic/izpack/tools/chocolateyUninstall.ps1 b/automatic/izpack/tools/chocolateyUninstall.ps1
@@ -14,12 +14,9 @@ if (Test-Path "${Env:ProgramFiles(x86)}\IzPack\Uninstaller\") {
   throw
 }
 $installArgs = "javaw -jar `'$($unString)`'"
-try {
-  Start-Process $ahkExe $ahkRun
-  Start-ChocolateyProcessAsAdmin -Statements "$installArgs" `
-                                 -ExeToRun "powershell" `
-                                 -ValidExitCodes $validExitCodes
-  Remove-Item "$ahkRun" -Force
-} catch {
-  throw
-}
+
+Start-Process $ahkExe $ahkRun
+Start-ChocolateyProcessAsAdmin -Statements "$installArgs" `
+					   -ExeToRun "powershell" `
+					   -ValidExitCodes $validExitCodes
+Remove-Item "$ahkRun" -Force
diff --git a/automatic/netbeans/tools/chocolateyUninstall.ps1 b/automatic/netbeans/tools/chocolateyUninstall.ps1
@@ -11,12 +11,7 @@ function Get-UninstallString {
   }
 }
 
-try {
-  $packageName = '{{PackageName}}'
-  $uninstallArgs = '--silent'
-  $validExitCodes = @(0)
-  Start-ChocolateyProcessAsAdmin $uninstallArgs $(Get-UninstallString) -validExitCodes $validExitCodes
-}
-catch {
-  throw $_.Exception
-}
+$packageName = '{{PackageName}}'
+$uninstallArgs = '--silent'
+$validExitCodes = @(0)
+Start-ChocolateyProcessAsAdmin $uninstallArgs $(Get-UninstallString) -validExitCodes $validExitCodes