From e74567d495d1757f8fead939162446cfd6667d59 Mon Sep 17 00:00:00 2001
From: Michele Sciabarra <michele@sciabarra.com>
Date: Thu, 4 Dec 2014 13:26:57 +0100
Subject: [PATCH] fixed setup for unix and detecting javahome in mac

---
 agilesites.sh | 3 +++
 wcs/setup.sh  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/agilesites.sh b/agilesites.sh
index fe36920c..11b310fa 100644
--- a/agilesites.sh
+++ b/agilesites.sh
@@ -2,6 +2,9 @@
 BASE="$(dirname $0)"
 BASE="$(cd $BASE; pwd)"
 export PATH="$BASE/bin:$BASE/wcs/home/bin:$PATH"
+if test -e /usr/libexec/java_home
+then JAVA_HOME=$(/usr/libexec/java_home)
+fi
 if test -n "$JAVA_HOME"
 then export PATH="$JAVA_HOME/bin:$PATH"
 else echo JAVA_HOME must be defined and pointing to a JDK - not a JRE ; exit
diff --git a/wcs/setup.sh b/wcs/setup.sh
index 9638c945..37ea7d19 100755
--- a/wcs/setup.sh
+++ b/wcs/setup.sh
@@ -23,7 +23,7 @@ rm home/*.done
 touch home/hsql.flag
 touch home/setup.flag
 java -cp ../bin/wcs.jar wcs.Silent "$BASE" misc/silentinstaller/generic_omii.ini Sites/install.ini Sites/omii.ini
-java -cp ../bin/wcs.jar wcs.Silent "$BASE" misc/silentinstaller/generic_omii.ini Sites/install.ini home/ominstall/omii.ini
+cp Sites/omii.ini home/ominstallinfo/omii.ini
 java -cp ../bin/wcs.jar wcs.Replacer .. "$BASE" <context.xml >webapps/cs/META-INF/context.xml
 java -cp ../bin/wcs.jar wcs.Unzip Sites/csdt.zip home
 cd ..