=== modified file 'installers/src/bitrock/DHIS2_pginstaller.xml'
--- installers/src/bitrock/DHIS2_pginstaller.xml 2011-03-11 14:16:44 +0000
+++ installers/src/bitrock/DHIS2_pginstaller.xml 2011-03-11 14:41:52 +0000
@@ -11,7 +11,9 @@
1
+ 0
0
+ 0
@@ -73,19 +75,33 @@
- No valid JRE was detcted and one could not be installed. The installation of DHIS2 will be aborted.
+ 0
Installing Java Runtime Enviornment
jre-6u24-windows-i586-s.exe
- /s /v /log ${installdir}\logs\javainstall.txt
+ /s /v /log javainstall.txt
Installing Java Runtime Enviornment
+ 0
0
${installdir}\tmp\
yes
- Java was unable to be installed. Do you wish to proceed anyway?
- ${proceed_without_java}
+ Java was unable to be installed. Do you wish to try and install it manually?
+ ${java_gui_install}
+
+ jre-6u24-windows-i586-s.exe
+
+ 0
+ ${installdir}\tmp\
+
+
+ equals
+ ${java_gui_install}
+ 1
+
+
+