summaryrefslogtreecommitdiffstats
path: root/planet2
diff options
context:
space:
mode:
authorJOGAMP WEB TEAM <[email protected]>2013-06-19 21:15:49 +0200
committerJOGAMP WEB TEAM <[email protected]>2013-06-19 21:15:49 +0200
commitcf105c58622f37789ce5f8667578834ec49b6320 (patch)
tree45b72fd1995275d2c46cd644bca2f8fa00094cad /planet2
parente8a7d441f7f98cb786d48e21db4e2f0fded07fdc (diff)
update-planet* use jre7
Diffstat (limited to 'planet2')
-rw-r--r--planet2/update-planet.sh5
-rw-r--r--planet2/update-stream.sh6
2 files changed, 7 insertions, 4 deletions
diff --git a/planet2/update-planet.sh b/planet2/update-planet.sh
index ee07728..5dcd292 100644
--- a/planet2/update-planet.sh
+++ b/planet2/update-planet.sh
@@ -3,7 +3,8 @@
PLANET2=/srv/www/jogamp.org/planet2
cd $PLANET2
-export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:bin/javac::")
+export JRE_HOME=/opt-linux-x86_64/jre7
+# export JRE_HOME=$(readlink -f /usr/bin/java | sed "s:bin/java::")
-$JAVA_HOME/bin/java -jar HungryHarry-SNAPSHOT-jar-with-dependencies.jar $PLANET2/config/planet-config.xml
+$JRE_HOME/bin/java -jar HungryHarry-SNAPSHOT-jar-with-dependencies.jar $PLANET2/config/planet-config.xml
diff --git a/planet2/update-stream.sh b/planet2/update-stream.sh
index 03ede32..e60745d 100644
--- a/planet2/update-stream.sh
+++ b/planet2/update-stream.sh
@@ -3,6 +3,8 @@
PLANET2=/srv/www/jogamp.org/planet2
cd $PLANET2
-export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:bin/javac::")
+export JRE_HOME=/opt-linux-x86_64/jre7
+# export JRE_HOME=$(readlink -f /usr/bin/java | sed "s:bin/java::")
+
+$JRE_HOME/bin/java -jar HungryHarry-SNAPSHOT-jar-with-dependencies.jar $PLANET2/config/stream-config.xml
-$JAVA_HOME/bin/java -jar HungryHarry-SNAPSHOT-jar-with-dependencies.jar $PLANET2/config/stream-config.xml