diff options
| author | Alexandra Ellwood <lxs@mit.edu> | 2004-09-17 15:27:57 +0000 |
|---|---|---|
| committer | Alexandra Ellwood <lxs@mit.edu> | 2004-09-17 15:27:57 +0000 |
| commit | 37450a72019ccc2a38ad4045b345f718edc82dd1 (patch) | |
| tree | a169b0698e0a38a6d02552bca208594a76e0bde7 /src | |
| parent | d32a4feb45969700f964acb8b46ef5e95e9c8204 (diff) | |
| download | krb5-37450a72019ccc2a38ad4045b345f718edc82dd1.zip krb5-37450a72019ccc2a38ad4045b345f718edc82dd1.tar.gz krb5-37450a72019ccc2a38ad4045b345f718edc82dd1.tar.bz2 | |
pullup from trunk
ticket: 2714
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-3@16764 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/windows/installer/nsis/ChangeLog | 7 | ||||
| -rw-r--r-- | src/windows/installer/nsis/kfw-fixed.nsi | 56 |
2 files changed, 63 insertions, 0 deletions
diff --git a/src/windows/installer/nsis/ChangeLog b/src/windows/installer/nsis/ChangeLog index 3a0cd14..40d5e1e 100644 --- a/src/windows/installer/nsis/ChangeLog +++ b/src/windows/installer/nsis/ChangeLog @@ -1,3 +1,10 @@ +2004-09-17 Jeffrey Altman <jaltman@mit.edu> + +* kfw-fixed.nsi: + The version of MSIEXEC which ships with Windows 2000 does + not accept the /passive and /promptreboot command line + options. On Windows 2000 only, do not specify them. + 2004-09-13 Jeffrey Altman <jaltman@mit.edu> * kfw-fixed.nsi: diff --git a/src/windows/installer/nsis/kfw-fixed.nsi b/src/windows/installer/nsis/kfw-fixed.nsi index 4253ba9..6847c82 100644 --- a/src/windows/installer/nsis/kfw-fixed.nsi +++ b/src/windows/installer/nsis/kfw-fixed.nsi @@ -667,6 +667,10 @@ testWIX: ;Run the uninstaller uninstMSI1: + Call GetWindowsVersion + Pop $R0 + StrCmp $R0 "2000" uninstMSI1_2000 + ClearErrors ExecWait 'MSIEXEC /x{FD5B1F41-81BB-4BBC-9F7E-4B971660AE1A} /passive /promptrestart' @@ -680,7 +684,22 @@ uninstMSI1: Call RestartRequired Pop $R1 StrCmp $R1 "1" Restart DoNotRestart + +uninstMSI1_2000: + ClearErrors + ExecWait 'MSIEXEC /x{FD5B1F41-81BB-4BBC-9F7E-4B971660AE1A}' + + IfErrors no_remove_uninstaller + ;You can either use Delete /REBOOTOK in the uninstaller or add some code + ;here to remove the uninstaller. Use a registry key to check + ;whether the user has chosen to uninstall. If you are using an uninstaller + ;components page, make sure all sections are uninstalled. + Push $R1 + Call RestartRequired + Pop $R1 + StrCmp $R1 "1" Restart DoNotRestart + testSWRT: ClearErrors ReadRegStr $R0 HKLM \ @@ -696,6 +715,10 @@ testSWRT: ;Run the uninstaller uninstMSI2: + Call GetWindowsVersion + Pop $R0 + StrCmp $R0 "2000" uninstMSI2_2000 + ClearErrors ExecWait 'MSIEXEC /x{61211594-AAA1-4A98-A299-757326763CC7} /passive /promptrestart' @@ -710,6 +733,21 @@ uninstMSI2: Pop $R1 StrCmp $R1 "1" Restart DoNotRestart +uninstMSI2_2000: + ClearErrors + ExecWait 'MSIEXEC /x{61211594-AAA1-4A98-A299-757326763CC7}' + + IfErrors no_remove_uninstaller + ;You can either use Delete /REBOOTOK in the uninstaller or add some code + ;here to remove the uninstaller. Use a registry key to check + ;whether the user has chosen to uninstall. If you are using an uninstaller + ;components page, make sure all sections are uninstalled. + + Push $R1 + Call RestartRequired + Pop $R1 + StrCmp $R1 "1" Restart DoNotRestart + testPismere: ClearErrors ReadRegStr $R0 HKLM \ @@ -725,6 +763,10 @@ testPismere: ;Run the uninstaller uninstPismere: + Call GetWindowsVersion + Pop $R0 + StrCmp $R0 "2000" uninstPismere_2000 + ClearErrors ExecWait 'MSIEXEC /x{83977767-388D-4DF8-BB08-3BF2401635BD} /passive /promptrestart' @@ -739,6 +781,20 @@ uninstPismere: Pop $R1 StrCmp $R1 "1" Restart DoNotRestart +uninstPismere_2000: + ClearErrors + ExecWait 'MSIEXEC /x{83977767-388D-4DF8-BB08-3BF2401635BD}' + + IfErrors no_remove_uninstaller + ;You can either use Delete /REBOOTOK in the uninstaller or add some code + ;here to remove the uninstaller. Use a registry key to check + ;whether the user has chosen to uninstall. If you are using an uninstaller + ;components page, make sure all sections are uninstalled. + + Push $R1 + Call RestartRequired + Pop $R1 + StrCmp $R1 "1" Restart DoNotRestart Restart: |