? jmblack.diff
? install/scripts/adaware.bat
? install/scripts/cleanup.bat
? install/scripts/d-tools.bat
? install/scripts/example1.bat
? install/scripts/firefox-broken.bat
? install/scripts/googletb.bat
? install/scripts/mbm5.bat
? install/scripts/nav2003.bat
? install/scripts/realvnc.bat
? install/scripts/spybotsd.bat
? install/scripts/ultravnc.bat
? install/scripts/webshots.bat
? install/scripts/win2pdf.bat
? install/scripts/winamp5.bat
? install/scripts/winrar.bat
Index: install/bin/mapznrun.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/bin/mapznrun.bat,v
retrieving revision 1.9
diff -u -r1.9 mapznrun.bat
--- install/bin/mapznrun.bat	15 Jan 2004 17:43:29 -0000	1.9
+++ install/bin/mapznrun.bat	25 Mar 2004 09:15:50 -0000
@@ -1,6 +1,10 @@
-@echo off
-if exist c:\netinst\permcred.bat call c:\netinst\permcred.bat
-if exist c:\netinst\tempcred.bat call c:\netinst\tempcred.bat
+@set debug=no
+::
+@if "%debug%"=="no"  @Echo off && set stdout=nul && set stderr=nul
+@if "%debug%"=="yes" @Echo on  && set stdout=con && set stderr=con
+
+if exist %systemdrive%\netinst\permcred.bat call %systemdrive%\netinst\permcred.bat
+if exist %systemdrive%\netinst\tempcred.bat call %systemdrive%\netinst\tempcred.bat
 
 if not %Z%. == . goto got_drive
 set Z=Z:
@@ -19,22 +23,28 @@
 
 :try_again
 set COUNT=x%COUNT%
-if not %COUNT% == xxxxxxxxxxxxxxxxxxxx goto mapit
-echo Too many retries; giving up
+if not %COUNT% == xxxxxxxxxxxxxxx goto mapit
+@echo.
+@echo Unable to Map Drive Z: - See Below for more information
+@echo.
+@echo on
+net use %Z% %Z_PATH% %Z_PASS% %USER_ARG% /persistent:no
+@echo off
+Echo.
 goto hang
 
 :mapit
-echo Mapping %Z_PATH% on %Z%...
-net use %Z% %Z_PATH% %Z_PASS% %USER_ARG% /persistent:no
+echo Mapping: %Z_PATH% on %Z%
+net use %Z% %Z_PATH% %Z_PASS% %USER_ARG% /persistent:no >> %stdout% 2>%stderr%
 if exist %Z%\ goto mapped
-net use %Z% /delete
-echo Failed; retrying.
+net use %Z% /delete >> %stdout% 2>%stderr%
+@echo Failed; retrying. >> %stdout%
 :: Sleep for 10 seconds
-ping -n 10 localhost > nul
+ping -n 10 localhost >> %stdout%
 goto try_again
 
 :mapped
-echo ...done.
+@echo ...done. >> %stdout%
 :: Clean up environment, except for %Z%
 set Z_PATH=
 set Z_USER=
@@ -43,9 +53,11 @@
 set COUNT=
 
 :: Invoke command passed as argument
+if "%1"=="/mapznexit" goto :end
+
 %1 %2 %3 %4 %5 %6 %7 %8 %9
 if not errorlevel 1 goto end
-echo FAILURE in mapznrun.bat
+@echo FAILURE in mapznrun.bat
 
 :hang
 goto hang
Index: install/scripts/7-zip.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/7-zip.bat,v
retrieving revision 1.8
diff -u -r1.8 7-zip.bat
--- install/scripts/7-zip.bat	15 Dec 2003 17:04:39 -0000	1.8
+++ install/scripts/7-zip.bat	25 Mar 2004 09:15:50 -0000
@@ -1,4 +1,5 @@
+@Echo off
+::
 :: OPTIONAL: Install 7-Zip
-:: URL|ALL|http://www.7-zip.org/dl/7z313.exe|packages/7z313.exe
-
-todo.pl "%Z%\packages\7z313.exe -y /q /r:n"
+:: URL|ALL|http://www.7-zip.org/dl/7z313.exe|packages/7-zip/7z313.exe
+todo.pl "%Z%\packages\7-zip\7z313.exe -y /q /r:n"
Index: install/scripts/acrobat-reader.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/acrobat-reader.bat,v
retrieving revision 1.13
diff -u -r1.13 acrobat-reader.bat
--- install/scripts/acrobat-reader.bat	22 Mar 2004 13:56:32 -0000	1.13
+++ install/scripts/acrobat-reader.bat	25 Mar 2004 09:15:50 -0000
@@ -1,9 +1,9 @@
+@Echo off
 :: Install Adobe Acrobat reader
 :: URL|ENU|http://ardownload.adobe.com/pub/adobe/acrobatreader/win/5.x/5.1/AcroReader51_ENU_full.exe|packages/adobereader/acroreader51_enu_full.exe
 :: URL|DEU|http://download.adobe.com/pub/adobe/acrobatreader/win/5.x/5.1/AcroReader51_DEU_full.exe|packages/adobereader/acroreader51_deu_full.exe
 :: URL|NLD|http://download.adobe.com/pub/adobe/acrobatreader/win/5.x/5.1/AcroReader51_NLD_full.exe|packages/adobereader/acroreader51_nld_full.exe
 :: URL|FRA|http://download.adobe.com/pub/adobe/acrobatreader/win/5.x/5.1/AcroReader51_FRA_full.exe|packages/adobereader/acroreader51_fra_full.exe
 
-start /wait %Z%\packages\AdobeReader\AcroReader51_%WINLANG%_full.exe /a /s /sms /f1%Z%\packages\AdobeReader\acrobat.iss /f2%SystemDrive%\netinst\logs\acrobat.txt
-
-if errorlevel 1 exit 1
+todo.pl "%Z%\packages\AdobeReader\AcroReader51_%WINLANG%_full.exe /a /s /sms /f1%Z%\packages\AdobeReader\acrobat.iss /f2%SystemDrive%\netinst\logs\acrobat.txt"
+if errorlevel 1 exit 1
\ No newline at end of file
Index: install/scripts/adobe-reader.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/adobe-reader.bat,v
retrieving revision 1.11
diff -u -r1.11 adobe-reader.bat
--- install/scripts/adobe-reader.bat	22 Mar 2004 13:56:38 -0000	1.11
+++ install/scripts/adobe-reader.bat	25 Mar 2004 09:15:50 -0000
@@ -1,3 +1,4 @@
+@Echo off
 :: Install Adobe Reader
 :: URL|ENU|http://ardownload.adobe.com/pub/adobe/reader/win/6.x/6.0/enu/AdbeRdr60_enu_full.exe|packages/adobereader/adberdr60_enu_full.exe
 :: URL|DEU|http://ardownload.adobe.com/pub/adobe/reader/win/6.x/6.0/deu/AdbeRdr60_deu_full.exe|packages/adobereader/adberdr60_deu_full.exe
Index: install/scripts/att.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/att.bat,v
retrieving revision 1.10
diff -u -r1.10 att.bat
--- install/scripts/att.bat	16 Nov 2003 16:34:25 -0000	1.10
+++ install/scripts/att.bat	25 Mar 2004 09:15:50 -0000
@@ -1,3 +1,4 @@
+@Echo off
 :: Install AT&T Global Network Dialer
 :: URL|ALL|ftp://ftp.attglobal.net/pub/client/win32/d5091.exe|packages/d5091.exe
 
Index: install/scripts/base.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/base.bat,v
retrieving revision 1.30
diff -u -r1.30 base.bat
--- install/scripts/base.bat	13 Nov 2003 19:48:37 -0000	1.30
+++ install/scripts/base.bat	25 Mar 2004 09:15:50 -0000
@@ -1,3 +1,4 @@
+@Echo off
 :: MASTER: Perform a basic workstation installation
 
 :: Set Automatic Updates to download automatically but prompt before install.
Index: install/scripts/capicom.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/capicom.bat,v
retrieving revision 1.4
diff -u -r1.4 capicom.bat
--- install/scripts/capicom.bat	21 Sep 2003 18:07:16 -0000	1.4
+++ install/scripts/capicom.bat	25 Mar 2004 09:15:50 -0000
@@ -1,3 +1,4 @@
+@Echo off
 :: Install CryptoAPI COM interface (CAPICOM).  Useful for doing
 :: cryptographic operations from scripts.
 
Index: install/scripts/cygwin-1.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/cygwin-1.bat,v
retrieving revision 1.11
diff -u -r1.11 cygwin-1.bat
--- install/scripts/cygwin-1.bat	24 Oct 2003 23:06:31 -0000	1.11
+++ install/scripts/cygwin-1.bat	25 Mar 2004 09:15:50 -0000
@@ -1,3 +1,4 @@
+@Echo off
 :: Perform post-install Cygwin configuration.
 
 :: Set up mounts (/projects, /releases, etc.)
Index: install/scripts/cygwin.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/cygwin.bat,v
retrieving revision 1.7
diff -u -r1.7 cygwin.bat
--- install/scripts/cygwin.bat	21 Sep 2003 18:07:25 -0000	1.7
+++ install/scripts/cygwin.bat	25 Mar 2004 09:15:50 -0000
@@ -1,3 +1,4 @@
+@Echo off
 :: Install Cygwin
 
 :: After installing Cygwin package, configure it.
Index: install/scripts/defrag.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/defrag.bat,v
retrieving revision 1.2
diff -u -r1.2 defrag.bat
--- install/scripts/defrag.bat	12 Nov 2003 20:03:36 -0000	1.2
+++ install/scripts/defrag.bat	25 Mar 2004 09:15:51 -0000
@@ -1,3 +1,4 @@
+@Echo off
 :: Defragment the C: drive
 
 if exist %SystemRoot%\system32\defrag.exe goto got_defrag
Index: install/scripts/develop.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/develop.bat,v
retrieving revision 1.3
diff -u -r1.3 develop.bat
--- install/scripts/develop.bat	4 Oct 2003 19:52:27 -0000	1.3
+++ install/scripts/develop.bat	25 Mar 2004 09:15:51 -0000
@@ -1,3 +1,4 @@
+@Echo off
 :: MASTER: Install a developer workstation
 
 :: C:\Perl\bin\HEAD conflicts with Cygwin version (because Windows is
Index: install/scripts/emacs.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/emacs.bat,v
retrieving revision 1.3
diff -u -r1.3 emacs.bat
--- install/scripts/emacs.bat	21 Sep 2003 18:07:40 -0000	1.3
+++ install/scripts/emacs.bat	25 Mar 2004 09:15:51 -0000
@@ -1,9 +1,10 @@
+@Echo off
 :: Install Emacs for Windows
 
-set zip="c:\Program Files\7-ZIP\7z.exe"
+set zip="%ProgramFiles%\7-ZIP\7z.exe"
 set prog=emacs-21.3
 
-c:
+%SystemDrive%
 cd \
 
 %zip% x %Z%\packages\%prog%-fullbin-i386.tar.gz
Index: install/scripts/ie6.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/ie6.bat,v
retrieving revision 1.35
diff -u -r1.35 ie6.bat
--- install/scripts/ie6.bat	18 Mar 2004 11:31:55 -0000	1.35
+++ install/scripts/ie6.bat	25 Mar 2004 09:15:51 -0000
@@ -1,3 +1,4 @@
+@Echo off
 :: Install IE6
 
 :: Note that since we are pushing these commands onto the to-do stack,
Index: install/scripts/mozilla.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/mozilla.bat,v
retrieving revision 1.12
diff -u -r1.12 mozilla.bat
--- install/scripts/mozilla.bat	16 Jan 2004 17:27:28 -0000	1.12
+++ install/scripts/mozilla.bat	25 Mar 2004 09:15:51 -0000
@@ -1,4 +1,4 @@
-:: OPTIONAL: Install Mozilla
-:: URL|ALL|http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.6/mozilla-win32-1.6-installer.exe|packages/mozilla-win32-1.6-installer.exe
-
-todo.pl "%Z%\packages\mozilla-win32-1.6-installer.exe -ma -ira"
+@Echo off
+:: OPTIONAL: Install Mozilla
+:: URL|ALL|http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.6/mozilla-win32-1.6-installer.exe|packages/mozilla-win32-1.6-installer.exe
+todo.pl "%Z%\packages\mozilla-win32-1.6-installer.exe -ma -ira"
\ No newline at end of file
Index: install/scripts/msdn.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/msdn.bat,v
retrieving revision 1.8
diff -u -r1.8 msdn.bat
--- install/scripts/msdn.bat	22 Mar 2004 13:56:43 -0000	1.8
+++ install/scripts/msdn.bat	25 Mar 2004 09:15:51 -0000
@@ -1,3 +1,4 @@
+@Echo off
 :: Install MSDN Library
 
 :: Reboot when installation is finished.
Index: install/scripts/notes.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/notes.bat,v
retrieving revision 1.3
diff -u -r1.3 notes.bat
--- install/scripts/notes.bat	21 Sep 2003 18:07:59 -0000	1.3
+++ install/scripts/notes.bat	25 Mar 2004 09:15:51 -0000
@@ -1,3 +1,4 @@
+@Echo off
 :: Install Notes 5.0.8, then update it to the current release.
 
 %Z%
Index: install/scripts/ofc2003.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/ofc2003.bat,v
retrieving revision 1.2
diff -u -r1.2 ofc2003.bat
--- install/scripts/ofc2003.bat	22 Mar 2004 13:56:49 -0000	1.2
+++ install/scripts/ofc2003.bat	25 Mar 2004 09:15:51 -0000
@@ -1,3 +1,4 @@
+@Echo off
 :: OPTIONAL: Install Office 2003 and its updates
 
 :: See <http://www.microsoft.com/office/ork/updates/2003/> for a
@@ -15,7 +16,7 @@
 :: URL|ENU|http://download.microsoft.com/download/3/3/0/33067852-1400-4BEB-ADFE-8ABA8661F16A/Office2003-kb830000-client-enu.exe|updates/office2003/office2003-kb830000-client-enu.exe
 :: URL|NLD|http://download.microsoft.com/download/e/2/c/e2cdc6fa-3fed-4694-981b-cdebc435aa68/office2003-kb830000-client-nld.exe|updates/office2003/office2003-kb830000-client-nld.exe
 :: <http://support.microsoft.com/?id=830000>
-::todo.pl "%Z%\updates\office2003\office2003-kb830000-client-%WINLANG%.exe /q /c:\"msiexec /qb /l* %SystemDrive\netinst\logs\o2003-kb830000.txt /p winword-Binary-GLB.msp REBOOT=ReallySuppress\""
+::todo.pl "%Z%\updates\office2003\office2003-kb830000-client-%WINLANG%.exe /q /c:\"msiexec /qb /l* %SystemDrive%\netinst\logs\o2003-kb830000.txt /p winword-Binary-GLB.msp REBOOT=ReallySuppress\""
 ::not yet working, returns error 1328!
 
 
Index: install/scripts/office2k.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/office2k.bat,v
retrieving revision 1.23
diff -u -r1.23 office2k.bat
--- install/scripts/office2k.bat	22 Mar 2004 13:56:54 -0000	1.23
+++ install/scripts/office2k.bat	25 Mar 2004 09:15:51 -0000
@@ -1,3 +1,4 @@
+@Echo off
 :: OPTIONAL: Install Office 2000 and its updates
 
 :: Reboot after installing everything (superstition)
Index: install/scripts/officeop.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/officeop.bat,v
retrieving revision 1.5
diff -u -r1.5 officeop.bat
--- install/scripts/officeop.bat	19 Mar 2004 17:02:11 -0000	1.5
+++ install/scripts/officeop.bat	25 Mar 2004 09:15:51 -0000
@@ -1,3 +1,4 @@
+@Echo off
 :: OPTIONAL: Install OpenOffice.org
 :: URL|ENU|http://www.ibiblio.org/pub/mirrors/openoffice/stable/1.1.0/OOo_1.1.0_Win32Intel_install.zip|packages/openoffice/ooo_1.1.0_win32intel_install_enu.zip
 :: URL|DEU|http://sunsite.informatik.rwth-aachen.de/pub/mirror/OpenOffice/localized/de/1.1.0/OOo_1.1.0_Win32Intel_install_de.zip|packages/openoffice/ooo_1.1.0_win32intel_install_deu.zip
Index: install/scripts/officexp.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/officexp.bat,v
retrieving revision 1.31
diff -u -r1.31 officexp.bat
--- install/scripts/officexp.bat	24 Mar 2004 15:05:40 -0000	1.31
+++ install/scripts/officexp.bat	25 Mar 2004 09:15:51 -0000
@@ -1,3 +1,4 @@
+@Echo off
 :: OPTIONAL: Install Office XP and its updates
 
 :: Reminder: Commands will be executed in reverse order.
 
Index: install/scripts/perl.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/perl.bat,v
retrieving revision 1.14
diff -u -r1.14 perl.bat
--- install/scripts/perl.bat	22 Mar 2004 13:57:21 -0000	1.14
+++ install/scripts/perl.bat	25 Mar 2004 09:15:51 -0000
@@ -1,10 +1,16 @@
+@Echo off
 :: Yuck; I *hate* random delays.  But without this, Perl installation
 :: hangs on some (fast) systems.  I wish I knew what we were really
 :: waiting for.  See
 :: <http://www.mail-archive.com/unattended-info%40lists.sourceforge.net/msg01259.html>.
-ping -n 10 localhost > nul
 
-:: This will gracefully exit on both 2000, XP, and 2003 if already installed
+@set delay=10
+Echo Waiting: %delay% seconds
+ping -n %delay% localhost > nul
+@set delay=
+
+@Echo Running: Windows Installer 2.0
+:: This will gracefully exit on 2000, XP, and 2003 if already installed
 :: URL|ALL|http://download.microsoft.com/download/WindowsInstaller/Install/2.0/NT45/EN-US/InstMsiW.exe|packages/windowsinstaller/instmsiw.exe
 if not exist %Z%\packages\windowsinstaller\instmsiw.exe goto nomsi
 %Z%\packages\windowsinstaller\InstMsiW.exe /q /c:"msiinst.exe /i instmsi.msi /q"
@@ -15,6 +21,7 @@
 :: (The latter is undocumented; see
 :: http://bugs.activestate.com/show_bug.cgi?id=20364)
 
+@Echo Running: ActivePerl
 :: URL|ALL|http://downloads.activestate.com/ActivePerl/Windows/5.8/ActivePerl-5.8.3.809-MSWin32-x86.msi|packages/activeperl-5.8.3.809-mswin32-x86.msi
 start /wait msiexec /qb /l* %SystemDrive%\netinst\logs\perl.txt /i %Z%\packages\ActivePerl-5.8.3.809-MSWin32-x86.msi PERL_PATH=Yes PERL_EXT=Yes
 @if errorlevel 1 exit 1
Index: install/scripts/php.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/php.bat,v
retrieving revision 1.6
diff -u -r1.6 php.bat
--- install/scripts/php.bat	16 Nov 2003 16:34:25 -0000	1.6
+++ install/scripts/php.bat	25 Mar 2004 09:15:51 -0000
@@ -1,3 +1,4 @@
+@Echo off
 :: Install PHP
 :: URL|ALL|http://us3.php.net/get/php-4.3.4-installer.exe/from/www.php.net/mirror|packages/php-4.3.4-installer.exe
 
Index: install/scripts/powertoy.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/powertoy.bat,v
retrieving revision 1.4
diff -u -r1.4 powertoy.bat
--- install/scripts/powertoy.bat	22 Mar 2004 13:57:27 -0000	1.4
+++ install/scripts/powertoy.bat	25 Mar 2004 09:15:51 -0000
@@ -1,3 +1,4 @@
+@Echo off
 :: OPTIONAL: Install Windows PowerToys (for XP Only)
 :: URL|ALL|http://download.microsoft.com/download/whistler/Install/2/WXP/EN-US/CmdHerePowertoySetup.exe|packages/powertoys/cmdherepowertoysetup.exe
 :: URL|ALL|http://download.microsoft.com/download/whistler/Install/2/WXP/EN-US/ImageResizerPowertoySetup.exe|packages/powertoys/imageresizerpowertoysetup.exe
Index: install/scripts/reskit.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/reskit.bat,v
retrieving revision 1.4
diff -u -r1.4 reskit.bat
--- install/scripts/reskit.bat	22 Mar 2004 13:57:32 -0000	1.4
+++ install/scripts/reskit.bat	25 Mar 2004 09:15:51 -0000
@@ -1,5 +1,6 @@
+@Echo off
 :: Install the Windows 2000 resource kit
 
 :: Force the installation directory to be C:\NTRESKIT for historical
 :: reasons
-start /wait msiexec /qb /l* %SystemDrive%\netinst\logs\reskit.txt /i %Z%\packages\reskit\W2000RK.MSI NTRK50DIR=%SystemDrive%\NTRESKIT
+todo.pl "msiexec /qb /l* %SystemDrive%\netinst\logs\reskit.txt /i %Z%\packages\reskit\W2000RK.MSI NTRK50DIR=%SystemDrive%\NTRESKIT"
Index: install/scripts/sales.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/sales.bat,v
retrieving revision 1.8
diff -u -r1.8 sales.bat
--- install/scripts/sales.bat	20 Sep 2003 18:23:59 -0000	1.8
+++ install/scripts/sales.bat	25 Mar 2004 09:15:51 -0000
@@ -1,3 +1,4 @@
+@Echo off
 :: MASTER: Install a salesperson laptop
 
 :: Do antivirus software last so it picks up Office and Notes
Index: install/scripts/shiva.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/shiva.bat,v
retrieving revision 1.3
diff -u -r1.3 shiva.bat
--- install/scripts/shiva.bat	21 Sep 2003 18:08:47 -0000	1.3
+++ install/scripts/shiva.bat	25 Mar 2004 09:15:51 -0000
@@ -1,3 +1,4 @@
+@Echo off
 :: Install Shiva VPN client
 
 :: Reboot when finished
Index: install/scripts/sshd.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/sshd.bat,v
retrieving revision 1.8
diff -u -r1.8 sshd.bat
--- install/scripts/sshd.bat	7 Jul 2003 17:48:48 -0000	1.8
+++ install/scripts/sshd.bat	25 Mar 2004 09:15:51 -0000
@@ -1,3 +1,4 @@
+@Echo off
 :: Install sshd, set it up as a service, etc.
 
 :: Note: This script presupposes the presense of the Resource Kit (for
Index: install/scripts/sun-jre.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/sun-jre.bat,v
retrieving revision 1.3
diff -u -r1.3 sun-jre.bat
--- install/scripts/sun-jre.bat	21 Mar 2004 02:09:51 -0000	1.3
+++ install/scripts/sun-jre.bat	25 Mar 2004 09:15:51 -0000
@@ -1,3 +1,4 @@
+@Echo off
 :: OPTIONAL: Install Sun Java Virtual Machine
 
 :: URL|ALL|http://java.sun.com/webapps/download/AutoDL?BundleId=9504|packages/j2re-1_4_2_03-windows-i586-p.exe

Index: install/scripts/support-tools.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/support-tools.bat,v
retrieving revision 1.7
diff -u -r1.7 support-tools.bat
--- install/scripts/support-tools.bat	22 Mar 2004 13:57:37 -0000	1.7
+++ install/scripts/support-tools.bat	25 Mar 2004 09:15:51 -0000
@@ -1,7 +1,8 @@
+@Echo off
 :: Install Win2k SP4 "Support Tools".  (FIXME; what about Windows XP?)
 :: URL|ALL|http://download.microsoft.com/download/2/0/C/20C1B0F7-B803-4BAB-BA2F-27DDCADAD68E/sp4supporttools.exe|packages/support-tools/sp4supporttools.exe
 :: Download sp4supporttools.exe and run with the /X paramater 
 :: Extract to /packges/support-tools
 
-start /wait msiexec /qb /l* %SystemDrive%\netinst\logs\support-tools.txt /i %Z%\packages\support-tools\i386\2000rkst.msi NTRK50DIR=%SystemDrive%\SupTools
-if errorlevel 1 exit 1
+todo.pl "msiexec /qb /l* %SystemDrive%\netinst\logs\support-tools.txt /i %Z%\packages\support-tools\i386\2000rkst.msi NTRK50DIR=%SystemDrive%\SupTools"
+::if errorlevel 1 exit 1
Index: install/scripts/symav.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/symav.bat,v
retrieving revision 1.3
diff -u -r1.3 symav.bat
--- install/scripts/symav.bat	22 Mar 2004 13:57:43 -0000	1.3
+++ install/scripts/symav.bat	25 Mar 2004 09:15:51 -0000
@@ -1,3 +1,4 @@
+@Echo off
 :: OPTIONAL: Install Symantec Anti-Virus Corporate Edition Client
 
 todo.pl "%Z%\packages\savceclt.exe /qn /l:%SystemDrive%\netinst\logs\savceclt.txt /v:2"
Index: install/scripts/tightvnc.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/tightvnc.bat,v
retrieving revision 1.4
diff -u -r1.4 tightvnc.bat
--- install/scripts/tightvnc.bat	16 Nov 2003 16:34:25 -0000	1.4
+++ install/scripts/tightvnc.bat	25 Mar 2004 09:15:51 -0000
@@ -1,4 +1,5 @@
+@Echo off
 :: OPTIONAL: Install TightVNC
-:: URL|ALL|http://easynews.dl.sourceforge.net/sourceforge/vnc-tight/tightvnc-1.2.9-setup.exe|packages/tightvnc-1.2.9-setup.exe
+:: URL|ALL|http://easynews.dl.sourceforge.net/sourceforge/vnc-tight/tightvnc-1.2.9-setup.exe|packages/tightvnc/tightvnc-1.2.9-setup.exe
 
-todo.pl "%Z%\packages\tightvnc-1.2.9-setup.exe /silent" "\"C:\Program Files\TightVNC\WinVNC.exe\" -install" "startup-type.pl manual winvnc"
+todo.pl "%Z%\packages\tightvnc\tightvnc-1.2.9-setup.exe /silent" "\"%ProgramFiles%\TightVNC\WinVNC.exe\" -install" "startup-type.pl manual winvnc"
Index: install/scripts/vs6.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/vs6.bat,v
retrieving revision 1.5
diff -u -r1.5 vs6.bat
--- install/scripts/vs6.bat	22 Mar 2004 13:57:52 -0000	1.5
+++ install/scripts/vs6.bat	25 Mar 2004 09:15:51 -0000
@@ -1,3 +1,4 @@
+@Echo off
 :: Install Visual Studio 6.0 and service pack
 
 :: Trick acmboot.exe into thinking that GUI setup has already run
Index: install/scripts/vsnet.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/vsnet.bat,v
retrieving revision 1.5
diff -u -r1.5 vsnet.bat
--- install/scripts/vsnet.bat	22 Mar 2004 13:57:59 -0000	1.5
+++ install/scripts/vsnet.bat	25 Mar 2004 09:15:51 -0000
@@ -1,3 +1,4 @@
+@Echo off
 :: Install Visual Studio .NET
 
 set VSNETDIR=%Z_PATH%\packages\VSNET
Index: install/scripts/win2k-updates.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/win2k-updates.bat,v
retrieving revision 1.13
diff -u -r1.13 win2k-updates.bat
--- install/scripts/win2k-updates.bat	14 Mar 2004 23:14:59 -0000	1.13
+++ install/scripts/win2k-updates.bat	25 Mar 2004 09:15:51 -0000
@@ -1,3 +1,4 @@
+@Echo off
 :: Install all updates for Windows 2000
 
 :: After installing SP4, install updates for win2ksp4
Index: install/scripts/win2ksp4-symbols.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/win2ksp4-symbols.bat,v
retrieving revision 1.2
diff -u -r1.2 win2ksp4-symbols.bat
--- install/scripts/win2ksp4-symbols.bat	6 Nov 2003 22:35:52 -0000	1.2
+++ install/scripts/win2ksp4-symbols.bat	25 Mar 2004 09:15:51 -0000
@@ -1,3 +1,4 @@
+@Echo off
 :: Install Windows 2000 SP4 debugging symbols
 
 start /wait %Z%\bin\AutoIt.exe %Z%\scripts\win2ksp4-symbols.aut
Index: install/scripts/win2ksp4-updates.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/win2ksp4-updates.bat,v
retrieving revision 1.54
diff -u -r1.54 win2ksp4-updates.bat
--- install/scripts/win2ksp4-updates.bat	22 Mar 2004 13:58:18 -0000	1.54
+++ install/scripts/win2ksp4-updates.bat	25 Mar 2004 09:15:52 -0000
@@ -1,3 +1,4 @@
+@Echo off
 :: Install updates for Win2k SP4
 
 :: Some of these can only be downloaded using the Windows Update
Index: install/scripts/winxp-updates.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/winxp-updates.bat,v
retrieving revision 1.10
diff -u -r1.10 winxp-updates.bat
--- install/scripts/winxp-updates.bat	24 Mar 2004 14:04:22 -0000	1.10
+++ install/scripts/winxp-updates.bat	25 Mar 2004 09:15:52 -0000
@@ -1,3 +1,4 @@
+@Echo off
 :: Install all updates for Windows XP
 
 :: After installing SP1, install updates for winxpsp1.

Index: install/scripts/winxpsp1-symbols.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/winxpsp1-symbols.bat,v
retrieving revision 1.5
diff -u -r1.5 winxpsp1-symbols.bat
--- install/scripts/winxpsp1-symbols.bat	17 Mar 2004 19:40:10 -0000	1.5
+++ install/scripts/winxpsp1-symbols.bat	25 Mar 2004 09:15:52 -0000
@@ -1,3 +1,4 @@
+@Echo off
 :: Install Windows XP SP1 debugging symbols
 :: URL|ALL|http://msdl.microsoft.com/download/symbols/packages/windowsxp/xpsp1sym_x86.exe|updates/winxpsp1/xpsp1sym_x86.exe
 :: <http://www.microsoft.com/whdc/ddk/debugging/symbolpkg.mspx>
Index: install/scripts/winxpsp1-updates.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/winxpsp1-updates.bat,v
retrieving revision 1.101
diff -u -r1.101 winxpsp1-updates.bat
--- install/scripts/winxpsp1-updates.bat	24 Mar 2004 22:15:00 -0000	1.101
+++ install/scripts/winxpsp1-updates.bat	25 Mar 2004 09:15:52 -0000
@@ -1,3 +1,4 @@
+@Echo off
 :: Install all updates and hotfixes for Windows XP SP1
 
 :: Some of these can only be downloaded using the Windows Update
Index: install/scripts/ws2k3-updates.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/ws2k3-updates.bat,v
retrieving revision 1.22
diff -u -r1.22 ws2k3-updates.bat
--- install/scripts/ws2k3-updates.bat	20 Mar 2004 13:19:30 -0000	1.22
+++ install/scripts/ws2k3-updates.bat	25 Mar 2004 09:15:52 -0000
@@ -1,3 +1,4 @@
+@Echo off
 :: Install all updates and hotfixes for Windows Server 2003
 
 :: Some of these can only be downloaded using the Windows Update