Use array format for powershell script arguments

also normalize/cleanup style
2020-10-29 16:53:59 -04:00 · 2020-10-29 16:53:59 -04:00 · a9dcfa48bb
commit a9dcfa48bb
parent 7b3ae85e50
7 changed files with 54 additions and 63 deletions
--- a/chitubox/tools/chocolateyInstall.ps1
+++ b/chitubox/tools/chocolateyInstall.ps1
@ -1,14 +1,11 @@
-$packageName = 'chitubox'
-$installerType = 'exe'
-$silentArgs = '/S'
-$url64 = '\\ucs\software\CHITUBOX64Install_1.6.1.exe'
-$checksum64 = 'd399dcc7f44f3a34a878a93e1ca6f9c4fefe845a46a743c49e1353efda5cc16b'
-$checksumType64 = 'sha256'
-$validExitCodes = @(0,1223)
-Install-ChocolateyPackage -PackageName $packageName `
-                          -FileType $installerType `
-                          -SilentArgs $silentArgs `
-                          -Url64bit $url64 `
-                          -ValidExitCodes $validExitCodes `
-                          -Checksum64 $checksum64 `
-                          -ChecksumType64 $checksumType64
+$packageArgs = @{
+  packageName    = $env:ChocolateyPackageName
+  FileType       = 'exe'
+  SilentArgs     = '/S'
+  Url64          = '\\ucs\software\CHITUBOX64Install_1.6.1.exe'
+  Checksum64     = 'd399dcc7f44f3a34a878a93e1ca6f9c4fefe845a46a743c49e1353efda5cc16b'
+  ChecksumType64 = 'sha256'
+  ValidExitCodes = @(0, 1223)
+}
+
+Install-ChocolateyPackage @packageArgs
--- a/vcarve-pro-makerspace-10.5/tools/chocolateyInstall.ps1
+++ b/vcarve-pro-makerspace-10.5/tools/chocolateyInstall.ps1
@ -1,14 +1,11 @@
-$packageName = 'vcarve-pro-makerspace-10.5'
-$installerType = 'exe'
-$silentArgs = '/S'
-$url64 = '\\ucs\software\VCarveProMakerspaceEditionV10507_Setup.exe'
-$checksum64 = '553c1ecc51d41314a44016b4183c80f43cbe88ae61292f7e43048bce414db686'
-$checksumType64 = 'sha256'
-$validExitCodes = @(0,1223)
-Install-ChocolateyPackage -PackageName $packageName `
-                          -FileType $installerType `
-                          -SilentArgs $silentArgs `
-                          -Url64bit $url64 `
-                          -ValidExitCodes $validExitCodes `
-                          -Checksum64 $checksum64 `
-                          -ChecksumType64 $checksumType64
+$packageArgs = @{
+  packageName    = $env:ChocolateyPackageName
+  FileType       = 'exe'
+  SilentArgs     = '/S'
+  Url64          = '\\ucs\software\VCarveProMakerspaceEditionV10507_Setup.exe'
+  Checksum64     = '553c1ecc51d41314a44016b4183c80f43cbe88ae61292f7e43048bce414db686'
+  ChecksumType64 = 'sha256'
+  ValidExitCodes = @(0, 1223)
+}
+
+Install-ChocolateyPackage @packageArgs
--- a/vcarve-pro-trial-10.5/tools/chocolateyInstall.ps1
+++ b/vcarve-pro-trial-10.5/tools/chocolateyInstall.ps1
@ -1,14 +1,11 @@
-$packageName = 'vcarve-pro-trial-10.5'
-$installerType = 'exe'
-$silentArgs = '/S'
-$url64 = '\\ucs\software\VCarveProTrialEditionV10505_Setup.exe'
-$checksum64 = '28491b876f541c4c0f3dc9056139820ec43ba4e703f0cf2bd575d059a946a84f'
-$checksumType64 = 'sha256'
-$validExitCodes = @(0,1223)
-Install-ChocolateyPackage -PackageName $packageName `
-                          -FileType $installerType `
-                          -SilentArgs $silentArgs `
-                          -Url64bit $url64 `
-                          -ValidExitCodes $validExitCodes `
-                          -Checksum64 $checksum64 `
-                          -ChecksumType64 $checksumType64
+$packageArgs = @{
+  packageName    = $env:ChocolateyPackageName
+  FileType       = 'exe'
+  SilentArgs     = '/S'
+  Url64          = '\\ucs\software\VCarveProTrialEditionV10505_Setup.exe'
+  Checksum64     = '28491b876f541c4c0f3dc9056139820ec43ba4e703f0cf2bd575d059a946a84f'
+  ChecksumType64 = 'sha256'
+  ValidExitCodes = @(0, 1223)
+}
+
+Install-ChocolateyPackage @packageArgs