svn commit: r638463 - /cocoon/branches/BRANCH_2_1_X/cocoon.sh

[vg...@apache.org]

Author: vgritsenko
Date: Tue Mar 18 10:45:21 2008
New Revision: 638463

URL: http://svn.apache.org/viewvc?rev=638463&view=rev
Log:
os x support

Modified:
    cocoon/branches/BRANCH_2_1_X/cocoon.sh

Modified: cocoon/branches/BRANCH_2_1_X/cocoon.sh
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/cocoon.sh?rev=638463&r1=638462&r2=638463&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/cocoon.sh (original)
+++ cocoon/branches/BRANCH_2_1_X/cocoon.sh Tue Mar 18 10:45:21 2008
@@ -72,6 +72,7 @@
     exit 1
 }
 
+
 # ----- Handle action parameter ------------------------------------------------
 DEFAULT_ACTION="servlet"
 ACTION="$1"
@@ -84,6 +85,21 @@
 fi
 ARGS="$*"
 
+
+# ----- OS specific support ----------------------------------------------------
+
+cygwin=false;
+darwin=false;
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  Darwin*) darwin=true
+           if [ -z "$JAVA_HOME" ] ; then
+             JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
+           fi
+           ;;
+esac
+
+
 # ----- Verify and Set Required Environment Variables -------------------------
 
 if [ "$JAVA_HOME" = "" ] ; then
@@ -135,10 +151,10 @@
 # ----- Set platform specific variables
 
 PATHSEP=":";
-case "`uname`" in
-   CYGWIN*) PATHSEP=";"
-            JAVA_HOME=`cygpath --unix "$JAVA_HOME"`;;
-esac
+if $cygwin; then
+  PATHSEP=";"
+  JAVA_HOME=`cygpath --unix "$JAVA_HOME"`;
+fi
 
 # ----- Set Local Variables ( used to minimize cut/paste) ---------------------