From fc1d7402d075f8ee3fe193881fc3843b82abdeca Mon Sep 17 00:00:00 2001 From: Eric Fontana Date: Wed, 19 Nov 2014 06:43:59 -0500 Subject: [PATCH] Fixed templatization for uninstall --- TimberWinR.sln | 1 + chocolateyUninstall.ps1.guid | 2 +- chocolateyUninstall.ps1.template | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/TimberWinR.sln b/TimberWinR.sln index aaf3365..5bcf14f 100644 --- a/TimberWinR.sln +++ b/TimberWinR.sln @@ -19,6 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution appveyor.yml = appveyor.yml chocolatey.png = chocolatey.png chocolateyInstall.ps1.template = chocolateyInstall.ps1.template + chocolateyUninstall.ps1.guid = chocolateyUninstall.ps1.guid chocolateyUninstall.ps1.template = chocolateyUninstall.ps1.template LICENSE.txt = LICENSE.txt README.md = README.md diff --git a/chocolateyUninstall.ps1.guid b/chocolateyUninstall.ps1.guid index 76d438e..a83f6c0 100644 --- a/chocolateyUninstall.ps1.guid +++ b/chocolateyUninstall.ps1.guid @@ -1,7 +1,7 @@ $packageName = 'TimberWinR-${version}' # arbitrary name for the package, used in messages $installerType = 'msi' #only one of these: exe, msi, msu $url = 'http://www.ericfontana.com/TimberWinR/TimberWinR-${version}.0.msi' # download url -$silentArgs = '{86CA5678-4687-4352-99EB-783CDB7C8D82} /quiet' +$silentArgs = '${PROJECTGUID} /quiet' $validExitCodes = @(0) #please insert other valid exit codes here, exit codes for ms http://msdn.microsoft.com/en-us/library/aa368542(VS.85).aspx UnInstall-ChocolateyPackage "$packageName" "$installerType" "$silentArgs" "$url" -validExitCodes $validExitCodes diff --git a/chocolateyUninstall.ps1.template b/chocolateyUninstall.ps1.template index 7659c85..9a45797 100644 --- a/chocolateyUninstall.ps1.template +++ b/chocolateyUninstall.ps1.template @@ -1,7 +1,7 @@ $packageName = 'TimberWinR-${version}' # arbitrary name for the package, used in messages $installerType = 'msi' #only one of these: exe, msi, msu $url = 'http://www.ericfontana.com/TimberWinR/TimberWinR-${version}.0.msi' # download url -$silentArgs = '${PROJECTGUID} /quiet' +$silentArgs = '{0084CE8C-1F06-4B74-9EB4-C3067850B173} /quiet' $validExitCodes = @(0) #please insert other valid exit codes here, exit codes for ms http://msdn.microsoft.com/en-us/library/aa368542(VS.85).aspx UnInstall-ChocolateyPackage "$packageName" "$installerType" "$silentArgs" "$url" -validExitCodes $validExitCodes