From: Shad L. <sl...@us...> - 2004-11-19 15:01:57
|
Update of /cvsroot/unattended/unattended/install/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12968 Modified Files: perl.bat win2k-updates.bat Log Message: Cleanup installer installation. Add download link to win2k-updates for installer3 Index: win2k-updates.bat =================================================================== RCS file: /cvsroot/unattended/unattended/install/scripts/win2k-updates.bat,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- win2k-updates.bat 19 Nov 2004 13:21:06 -0000 1.20 +++ win2k-updates.bat 19 Nov 2004 15:01:47 -0000 1.21 @@ -3,7 +3,10 @@ :: After installing SP4, install updates for win2ksp4 todo.pl win2ksp4-updates.bat -:: Update Windows Installer +:: Windows Installer 3.0 Redistributable +:: <http://support.microsoft.com/?kbid=884016> +:: <http://www.microsoft.com/downloads/details.aspx?FamilyID=5fbc5470-b259-4733-a914-a956122e08e8> +:: URL|ALL|http://download.microsoft.com/download/9/e/1/9e14751c-f897-4bbd-af7a-890d9a0f5430/WindowsInstaller-KB884016-v2-x86.exe|packages/windowsinstaller/WindowsInstaller-KB884016-v2-x86.exe todo.pl "%Z%\packages\windowsinstaller\WindowsInstaller-KB884016-v2-x86.exe /passive /norestart" :: Windows 2000 Service Pack 4 Network Install for IT Professionals Index: perl.bat =================================================================== RCS file: /cvsroot/unattended/unattended/install/scripts/perl.bat,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- perl.bat 19 Nov 2004 13:20:00 -0000 1.22 +++ perl.bat 19 Nov 2004 15:01:47 -0000 1.23 @@ -6,28 +6,23 @@ ping -n 10 localhost > nul -:: Install Windows Installer Redistributable -:: -:: URL|ALL|http://download.microsoft.com/download/9/e/1/9e14751c-f897-4bbd-af7a-890d9a0f5430/WindowsInstaller-KB884016-v2-x86.exe|packages/windowsinstaller/WindowsInstaller-KB884016-v2-x86.exe +:: Windows Installer 2.0 Redistributable for Windows NT 4.0 and 2000 +:: <http://www.microsoft.com/downloads/details.aspx?FamilyID=4B6140F9-2D36-4977-8FA1-6F8A0F5DCA8F> +:: Doesn't hurt to install this as it exits nicely if not needed. :: URL|ALL|http://download.microsoft.com/download/WindowsInstaller/Install/2.0/NT45/EN-US/InstMsiW.exe|packages/windowsinstaller/instmsiw.exe -:: -:: Windows Installer 3.0 only installs on Win2000 SP3 or SP4, Win2003Server, WinXP, WinXP SP1 -:: (so we install version 2.0 on systems below and perform an update later and -:: ignore it on systems above) - -if "%WINVER%" == "win2ksp3" goto wininst3 -if "%WINVER%" == "win2ksp4" goto wininst3 -if "%WINVER%" == "ws2k3" goto wininst3 -if "%WINVER%" == "winxp" goto wininst3 -if "%WINVER%" == "winxpsp1" goto wininst3 -if "%WINVER%" == "winxpsp2" goto continue - %Z%\packages\windowsinstaller\InstMsiW.exe /q /c:"msiinst.exe /i instmsi.msi /q" -goto continue -:wininst3 +:: Windows Installer 3.0 only installs on Win2000 SP3 or SP4, Win2003Server, WinXP, WinXP SP1 +:: (so we install version 2.0 and then upgrade to installer3 in win2k-updates.bat) +if "%WINVER%" == "win2k" goto skipinstaller3 + +:: Windows Installer 3.0 Redistributable +:: <http://support.microsoft.com/?kbid=884016> +:: <http://www.microsoft.com/downloads/details.aspx?FamilyID=5fbc5470-b259-4733-a914-a956122e08e8> +:: Doesn't hurt to install this as it exits niCely if not needed (Except on win2k). +:: URL|ALL|http://download.microsoft.com/download/9/e/1/9e14751c-f897-4bbd-af7a-890d9a0f5430/WindowsInstaller-KB884016-v2-x86.exe|packages/windowsinstaller/WindowsInstaller-KB884016-v2-x86.exe %Z%\packages\windowsinstaller\WindowsInstaller-KB884016-v2-x86.exe /passive /norestart -:continue +:skipinstaller3 set perl_msi=%Z%\packages\ActivePerl-5.8.4.810-MSWin32-x86.msi |