dubey/WebGoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Contribution by Kristian Erik Hermansen. Fixed to work with 1.6

Browse Source 
git-svn-id: http://webgoat.googlecode.com/svn/trunk/webgoat@365 4033779f-a91e-0410-96ef-6bf7bf53c507
This commit is contained in:
mayhew64 2008-09-09 15:32:23 +00:00
parent 5854b66614
commit 3412f1e984
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
main/webgoat.sh
View File

@ -7,25 +7,29 @@ export CATALINA_HOME PATH
chmod +x ./$CATALINA_HOME/bin/*.sh chmod +x ./$CATALINA_HOME/bin/*.sh
if [ $SYSTEM = "Darwin" ]; then if [ $SYSTEM = "Darwin" ]; then
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home
export JAVA_HOME export JAVA_HOME
else else
is_java_1dot5() { is_java_1dot6() {
if [ "X$JAVA_HOME" != "X" -a -d $JAVA_HOME ]; then if [ -z "$JAVA_HOME" ]; then
$JAVA_HOME/bin/java -version 2>&1 | grep 'version \"1.5' >/dev/null export JAVA_HOME=$(dirname $(readlink -f $(which javac)))/../
fi
if [ "X$JAVA_HOME" != "X" -a $JAVA_HOME ]; then
$JAVA_HOME/bin/java -version 2>&1 | grep 'version "1.6' >/dev/null
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "The JVM in \$JAVA_HOME isn't version 1.5." echo "The JVM in \$JAVA_HOME isn't version 1.6."
exit 1 exit 1
fi fi
else else
echo "Please set JAVA_HOME to a Java 1.5 JDK install" echo "Please set JAVA_HOME to a Java 1.6 JDK install"
exit 1 exit 1
fi fi
} }
is_java_1dot5 is_java_1dot6
fi fi