------------------------------------------------------------
revno: 684
committer: Lars Helge Oeverland larshe...@gmail.com
branch nick: trunk
timestamp: Fri 2009-09-11 21:14:49 +0200
message:
Removed check for JAVA_HOME in startup.sh in dhis-live.
modified:
dhis-live/util/launch4j/dhis-live.xml
dhis-live/util/script/startup.sh
--
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 'dhis-live/util/launch4j/dhis-live.xml'
--- dhis-live/util/launch4j/dhis-live.xml 2009-09-11 19:08:51 +0000
+++ dhis-live/util/launch4j/dhis-live.xml 2009-09-11 19:14:49 +0000
@@ -26,7 +26,7 @@
<splash>
<file>C:\development\src\dhis2\dhis-live\util\launch4j\dhis2-splash.bmp</file>
<waitForWindow>false</waitForWindow>
- <timeout>11</timeout>
+ <timeout>12</timeout>
<timeoutErr>false</timeoutErr>
</splash>
</launch4jConfig>
\ No newline at end of file
=== modified file 'dhis-live/util/script/startup.sh'
--- dhis-live/util/script/startup.sh 2009-09-11 19:03:58 +0000
+++ dhis-live/util/script/startup.sh 2009-09-11 19:14:49 +0000
@@ -1,10 +1,4 @@
#!/bin/sh
-#if [ "${JAVA_HOME:+1}" = "1" ]
-if true
-then
- echo "Starting DHIS 2..."
- java -jar dhis2-lite.jar
-else
- echo "DHIS 2 requires a Java Runtime Environment to be installed"
-fi
+echo "Starting DHIS 2..."
+java -jar dhis2-lite.jar
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
