dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3009
committer: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-03-11 15:41:52 +0100
message:
  Minor fixed Postgresql full installer.
modified:
  installers/src/bitrock/DHIS2_pginstaller.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== 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 @@
     <allowLanguageSelection>1</allowLanguageSelection>
     <initializationActionList>
         <autodetectJava>
+            <abortOnError>0</abortOnError>
             <promptUser>0</promptUser>
+            <showMessageOnError>0</showMessageOnError>
             <validVersionList>
                 <validVersion>
                     <maxVersion></maxVersion>
@@ -73,19 +75,33 @@
             </folderList>
             <postInstallationActionList>
                 <runProgram>
-                    <customErrorMessage>No valid JRE was detcted and one could not be installed. The installation of DHIS2 will be aborted.</customErrorMessage>
+                    <abortOnError>0</abortOnError>
                     <explanation>Installing Java Runtime Enviornment</explanation>
                     <program>jre-6u24-windows-i586-s.exe</program>
-                    <programArguments>/s /v /log ${installdir}\logs\javainstall.txt </programArguments>
+                    <programArguments>/s /v /log javainstall.txt </programArguments>
                     <progressText>Installing Java Runtime Enviornment</progressText>
+                    <showMessageOnError>0</showMessageOnError>
                     <useMSDOSPath>0</useMSDOSPath>
                     <workingDirectory>${installdir}\tmp\</workingDirectory>
                     <onErrorActionList>
                         <showQuestion>
                             <default>yes</default>
-                            <text>Java was unable to be installed. Do you wish to proceed anyway?</text>
-                            <variable>${proceed_without_java}</variable>
+                            <text>Java was unable to be installed. Do you wish to try and install it manually?</text>
+                            <variable>${java_gui_install}</variable>
                         </showQuestion>
+                        <runConsoleProgram>
+                            <program>jre-6u24-windows-i586-s.exe</program>
+                            <programArguments></programArguments>
+                            <useMSDOSPath>0</useMSDOSPath>
+                            <workingDirectory>${installdir}\tmp\</workingDirectory>
+                            <ruleList>
+                                <compareValues>
+                                    <logic>equals</logic>
+                                    <value1>${java_gui_install}</value1>
+                                    <value2>1</value2>
+                                </compareValues>
+                            </ruleList>
+                        </runConsoleProgram>
                     </onErrorActionList>
                     <ruleList>
                         <compareValues>