From a9dcfa48bb31e1bc3173468057d38a9992755083 Mon Sep 17 00:00:00 2001 From: Adam Goldsmith Date: Thu, 29 Oct 2020 16:53:59 -0400 Subject: [PATCH] Use array format for powershell script arguments also normalize/cleanup style --- chitubox/chitubox.nuspec | 2 +- chitubox/tools/chocolateyInstall.ps1 | 25 ++++++++----------- shopbot/tools/chocolateyInstall.ps1 | 24 +++++++++--------- .../tools/chocolateyInstall.ps1 | 25 ++++++++----------- .../tools/chocolateyUninstall.ps1 | 8 +++--- .../tools/chocolateyInstall.ps1 | 25 ++++++++----------- .../tools/chocolateyUninstall.ps1 | 8 +++--- 7 files changed, 54 insertions(+), 63 deletions(-) diff --git a/chitubox/chitubox.nuspec b/chitubox/chitubox.nuspec index 15d076a..40a7e06 100644 --- a/chitubox/chitubox.nuspec +++ b/chitubox/chitubox.nuspec @@ -17,4 +17,4 @@ - \ No newline at end of file + diff --git a/chitubox/tools/chocolateyInstall.ps1 b/chitubox/tools/chocolateyInstall.ps1 index 20e41da..55ae640 100644 --- 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 diff --git a/shopbot/tools/chocolateyInstall.ps1 b/shopbot/tools/chocolateyInstall.ps1 index 79b59b8..e5b9e7d 100644 --- a/shopbot/tools/chocolateyInstall.ps1 +++ b/shopbot/tools/chocolateyInstall.ps1 @@ -1,19 +1,19 @@ $basePackageArgs = @{ - PackageName = 'shopbot' - FileType = 'exe' - SilentArgs = '/verysilent /suppressmsgboxes /norestart /sp-' - Url64 = '\\ucs\software\Setup_Shopbot3_8_50.exe' - Checksum64 = '40ceb163b1cb6395bd4704db1da5359b20ee769ddb413609e4608d780db44c33' - ChecksumType64 = 'sha256' - ValidExitCodes = @(0, 1223) + PackageName = 'shopbot' + FileType = 'exe' + SilentArgs = '/verysilent /suppressmsgboxes /norestart /sp-' + Url64 = '\\ucs\software\Setup_Shopbot3_8_50.exe' + Checksum64 = '40ceb163b1cb6395bd4704db1da5359b20ee769ddb413609e4608d780db44c33' + ChecksumType64 = 'sha256' + ValidExitCodes = @(0, 1223) } $driverPackageArgs = @{ - PackageName = 'shopbot-driver' - FileType = 'exe' - File64 = 'C:\Program Files (x86)\ShopBot\ShopBot 3\Drivers\ShopBotControllerV201\Sb_Controller_Drivers.exe' - Checksum64 = 'a244f6fb77ac40d1ee5c6988a3b74bcf55345de871684684ab7f4f54e2a20f7b' - ChecksumType64 = 'sha256' + PackageName = 'shopbot-driver' + FileType = 'exe' + File64 = 'C:\Program Files (x86)\ShopBot\ShopBot 3\Drivers\ShopBotControllerV201\Sb_Controller_Drivers.exe' + Checksum64 = 'a244f6fb77ac40d1ee5c6988a3b74bcf55345de871684684ab7f4f54e2a20f7b' + ChecksumType64 = 'sha256' } diff --git a/vcarve-pro-makerspace-10.5/tools/chocolateyInstall.ps1 b/vcarve-pro-makerspace-10.5/tools/chocolateyInstall.ps1 index cb1740d..c4e0fac 100644 --- 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 diff --git a/vcarve-pro-makerspace-10.5/tools/chocolateyUninstall.ps1 b/vcarve-pro-makerspace-10.5/tools/chocolateyUninstall.ps1 index f4c0ccc..f7dd8f0 100644 --- a/vcarve-pro-makerspace-10.5/tools/chocolateyUninstall.ps1 +++ b/vcarve-pro-makerspace-10.5/tools/chocolateyUninstall.ps1 @@ -1,8 +1,8 @@ $packageArgs = @{ - PackageName = 'vcarve-pro-makerspace-10.5' - FileType = 'exe' - File = 'C:\Program Files\VCarve Pro - Makerspace Edition 10.5\uninst.exe' - SilentArgs = '/S' + PackageName = 'vcarve-pro-makerspace-10.5' + FileType = 'exe' + File = 'C:\Program Files\VCarve Pro - Makerspace Edition 10.5\uninst.exe' + SilentArgs = '/S' } Uninstall-ChocolateyPackage @packageArgs diff --git a/vcarve-pro-trial-10.5/tools/chocolateyInstall.ps1 b/vcarve-pro-trial-10.5/tools/chocolateyInstall.ps1 index 6ed8e14..985f6ef 100644 --- 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 diff --git a/vcarve-pro-trial-10.5/tools/chocolateyUninstall.ps1 b/vcarve-pro-trial-10.5/tools/chocolateyUninstall.ps1 index 3ad21ef..1545b72 100644 --- a/vcarve-pro-trial-10.5/tools/chocolateyUninstall.ps1 +++ b/vcarve-pro-trial-10.5/tools/chocolateyUninstall.ps1 @@ -1,8 +1,8 @@ $packageArgs = @{ - PackageName = 'vcarve-pro-trial-10.5' - FileType = 'exe' - File = 'C:\Program Files\VCarve Pro Trial Edition 10.5\uninst.exe' - SilentArgs = '/S' + PackageName = 'vcarve-pro-trial-10.5' + FileType = 'exe' + File = 'C:\Program Files\VCarve Pro Trial Edition 10.5\uninst.exe' + SilentArgs = '/S' } Uninstall-ChocolateyPackage @packageArgs