Index: unattended/install/scripts/emacs.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/emacs.bat,v
retrieving revision 1.4
diff -u -r1.4 emacs.bat
--- unattended/install/scripts/emacs.bat	19 Apr 2004 18:22:06 -0000	1.4
+++ unattended/install/scripts/emacs.bat	3 Aug 2004 14:28:44 -0000
@@ -1,6 +1,6 @@
 :: Install Emacs for Windows
 @Echo off
-set zip="c:\Program Files\7-ZIP\7z.exe"
+set zip="%ProgramFiles%\7-ZIP\7z.exe"
 set prog=emacs-21.3
 
 c:
Index: unattended/install/scripts/opera.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/opera.bat,v
retrieving revision 1.2
diff -u -r1.2 opera.bat
--- unattended/install/scripts/opera.bat	23 Jul 2004 12:30:21 -0000	1.2
+++ unattended/install/scripts/opera.bat	3 Aug 2004 14:28:44 -0000
@@ -1,36 +1,36 @@
-:: OPTIONAL: Install Opera Browser
-:: URL|ALL|ftp://ftp.opera.com/pub/opera/win/753/en/std/ow32enen753.exe|packages/opera/ow32enen753.exe
-:: note: we need the installer WITHOUT java (installer with java cannot install silently)
-@Echo off
-
-:: Language files:
-:: URL|BGR|ftp://ftp.opera.com/pub/opera/win/lng/723/bg/ow723_3227bg.lng|packages/opera/languages/opera-bgr.lng
-:: URL|CAT|ftp://ftp.opera.com/pub/opera/win/lng/723/ca/ow723_3227ca.lng|packages/opera/languages/opera-cat.lng
-:: URL|CHS|ftp://ftp.opera.com/pub/opera/win/lng/723/zh-cn/ow723_3227zh-cn.lng|packages/opera/languages/opera-chs.lng
-:: URL|DAN|ftp://ftp.opera.com/pub/opera/win/lng/723/da/ow723_3227da.lng|packages/opera/languages/opera-dan.lng
-:: URL|DEU|ftp://ftp.opera.com/pub/opera/win/lng/753/de/ow753_3850de.lng|packages/opera/languages/opera-deu.lng
-:: URL|ELL|ftp://ftp.opera.com/pub/opera/win/lng/711/el/ow711_2887el.lng|packages/opera/languages/opera-ell.lng
-:: URL|ENG|ftp://ftp.opera.com/pub/opera/win/lng/723/en-GB/ow723_3227en-GB.lng|packages/opera/languages/opera-eng.lng
-:: URL|ESN|ftp://ftp.opera.com/pub/opera/win/lng/752/es-ES/ow752_3834es-ES.lng|packages/opera/languages/opera-esn.lng
-:: URL|FIN|ftp://ftp.opera.com/pub/opera/win/lng/752/fi/ow752_3834fi.lng|packages/opera/languages/opera-fin.lng
-:: URL|FRA|ftp://ftp.opera.com/pub/opera/win/lng/752/fr/ow752_3834fr.lng|packages/opera/languages/opera-fra.lng
-:: URL|ITA|ftp://ftp.opera.com/pub/opera/win/lng/752/it/ow752_3834it.lng|packages/opera/languages/opera-ita.lng
-:: URL|JPN|ftp://ftp.opera.com/pub/opera/win/lng/723/ja/ow723_3227ja.lng|packages/opera/languages/opera-jpn.lng
-:: URL|KOR|ftp://ftp.opera.com/pub/opera/win/lng/752/ko/ow752_3834ko.lng|packages/opera/languages/opera-kor.lng
-:: URL|NLD|ftp://ftp.opera.com/pub/opera/win/lng/722/nl/ow722_3221nl.lng|packages/opera/languages/opera-nld.lng
-:: URL|NON|ftp://ftp.opera.com/pub/opera/win/lng/723/nn/ow723_3227nn.lng|packages/opera/languages/opera-non.lng
-:: URL|NOR|ftp://ftp.opera.com/pub/opera/win/lng/752/nb/ow752_3834nb.lng|packages/opera/languages/opera-nor.lng
-:: URL|PLK|ftp://ftp.opera.com/pub/opera/win/lng/723/pl/ow723_3227pl.lng|packages/opera/languages/opera-plk.lng
-:: URL|PTB|ftp://ftp.opera.com/pub/opera/win/lng/722/pt-BR/ow722_3221pt-BR.lng|packages/opera/languages/opera-ptb.lng
-:: URL|RUS|ftp://ftp.opera.com/pub/opera/win/lng/723/ru/ow723_3227ru.lng|packages/opera/languages/opera-rus.lng
-:: URL|SVE|ftp://ftp.opera.com/pub/opera/win/lng/723/sv/ow723_3227sv.lng|packages/opera/languages/opera-sve.lng
-:: URL|TRK|ftp://ftp.opera.com/pub/opera/win/lng/723/tr/ow723_3227tr.lng|packages/opera/languages/opera-trk.lng
-
-:: if you like to do special things (e.g. define custom searches), save your customized ini's in packages/opera/special
-
-%Z%\packages\opera\ow32enen753.exe /s
-if exist "%ProgramFiles%\Opera\Opera.exe" set opera="%ProgramFiles%\Opera"
-if exist "%ProgramFiles%\Opera7\Opera.exe" set opera="%ProgramFiles%\Opera7"
-if exist "%ProgramFiles%\Opera75\Opera.exe" set opera="%ProgramFiles%\Opera75"
-if exist "%Z%\packages\opera\languages\opera-%winlang%.lng" copy "%Z%\packages\opera\languages\opera-%winlang%.lng" "%opera%"
+:: OPTIONAL: Install Opera Browser
+:: URL|ALL|ftp://ftp.opera.com/pub/opera/win/753/en/std/ow32enen753.exe|packages/opera/ow32enen753.exe
+:: note: we need the installer WITHOUT java (installer with java cannot install silently)
+@Echo off
+
+:: Language files:
+:: URL|BGR|ftp://ftp.opera.com/pub/opera/win/lng/723/bg/ow723_3227bg.lng|packages/opera/languages/opera-bgr.lng
+:: URL|CAT|ftp://ftp.opera.com/pub/opera/win/lng/723/ca/ow723_3227ca.lng|packages/opera/languages/opera-cat.lng
+:: URL|CHS|ftp://ftp.opera.com/pub/opera/win/lng/723/zh-cn/ow723_3227zh-cn.lng|packages/opera/languages/opera-chs.lng
+:: URL|DAN|ftp://ftp.opera.com/pub/opera/win/lng/723/da/ow723_3227da.lng|packages/opera/languages/opera-dan.lng
+:: URL|DEU|ftp://ftp.opera.com/pub/opera/win/lng/753/de/ow753_3850de.lng|packages/opera/languages/opera-deu.lng
+:: URL|ELL|ftp://ftp.opera.com/pub/opera/win/lng/711/el/ow711_2887el.lng|packages/opera/languages/opera-ell.lng
+:: URL|ENG|ftp://ftp.opera.com/pub/opera/win/lng/723/en-GB/ow723_3227en-GB.lng|packages/opera/languages/opera-eng.lng
+:: URL|ESN|ftp://ftp.opera.com/pub/opera/win/lng/752/es-ES/ow752_3834es-ES.lng|packages/opera/languages/opera-esn.lng
+:: URL|FIN|ftp://ftp.opera.com/pub/opera/win/lng/752/fi/ow752_3834fi.lng|packages/opera/languages/opera-fin.lng
+:: URL|FRA|ftp://ftp.opera.com/pub/opera/win/lng/752/fr/ow752_3834fr.lng|packages/opera/languages/opera-fra.lng
+:: URL|ITA|ftp://ftp.opera.com/pub/opera/win/lng/752/it/ow752_3834it.lng|packages/opera/languages/opera-ita.lng
+:: URL|JPN|ftp://ftp.opera.com/pub/opera/win/lng/723/ja/ow723_3227ja.lng|packages/opera/languages/opera-jpn.lng
+:: URL|KOR|ftp://ftp.opera.com/pub/opera/win/lng/752/ko/ow752_3834ko.lng|packages/opera/languages/opera-kor.lng
+:: URL|NLD|ftp://ftp.opera.com/pub/opera/win/lng/722/nl/ow722_3221nl.lng|packages/opera/languages/opera-nld.lng
+:: URL|NON|ftp://ftp.opera.com/pub/opera/win/lng/723/nn/ow723_3227nn.lng|packages/opera/languages/opera-non.lng
+:: URL|NOR|ftp://ftp.opera.com/pub/opera/win/lng/752/nb/ow752_3834nb.lng|packages/opera/languages/opera-nor.lng
+:: URL|PLK|ftp://ftp.opera.com/pub/opera/win/lng/723/pl/ow723_3227pl.lng|packages/opera/languages/opera-plk.lng
+:: URL|PTB|ftp://ftp.opera.com/pub/opera/win/lng/722/pt-BR/ow722_3221pt-BR.lng|packages/opera/languages/opera-ptb.lng
+:: URL|RUS|ftp://ftp.opera.com/pub/opera/win/lng/723/ru/ow723_3227ru.lng|packages/opera/languages/opera-rus.lng
+:: URL|SVE|ftp://ftp.opera.com/pub/opera/win/lng/723/sv/ow723_3227sv.lng|packages/opera/languages/opera-sve.lng
+:: URL|TRK|ftp://ftp.opera.com/pub/opera/win/lng/723/tr/ow723_3227tr.lng|packages/opera/languages/opera-trk.lng
+
+:: if you like to do special things (e.g. define custom searches), save your customized ini's in packages/opera/special
+
+%Z%\packages\opera\ow32enen753.exe /s
+if exist "%ProgramFiles%\Opera\Opera.exe" set opera="%ProgramFiles%\Opera"
+if exist "%ProgramFiles%\Opera7\Opera.exe" set opera="%ProgramFiles%\Opera7"
+if exist "%ProgramFiles%\Opera75\Opera.exe" set opera="%ProgramFiles%\Opera75"
+if exist "%Z%\packages\opera\languages\opera-%winlang%.lng" copy "%Z%\packages\opera\languages\opera-%winlang%.lng" "%opera%"
 if exist "%Z%\packages\opera\special\*" copy "%Z%\packages\opera\special\*" "%opera%"
\ No newline at end of file
Index: unattended/install/scripts/tightvnc.bat
===================================================================
RCS file: /cvsroot/unattended/unattended/install/scripts/tightvnc.bat,v
retrieving revision 1.6
diff -u -r1.6 tightvnc.bat
--- unattended/install/scripts/tightvnc.bat	23 Jul 2004 18:22:49 -0000	1.6
+++ unattended/install/scripts/tightvnc.bat	3 Aug 2004 14:28:44 -0000
@@ -1,4 +1,4 @@
 :: OPTIONAL: Install TightVNC
 :: URL|ALL|http://dl.sourceforge.net/sourceforge/vnc-tight/tightvnc-1.2.9-setup.exe|packages/tightvnc-1.2.9-setup.exe
 @Echo off
-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-1.2.9-setup.exe /silent" "\"%ProgramFiles%\TightVNC\WinVNC.exe\" -install" "startup-type.pl manual winvnc"