You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by bi...@apache.org on 2001/08/20 20:36:04 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/bin digest.sh
bip 01/08/20 11:36:04
Modified: catalina/src/bin digest.sh
Log:
Fix for cygwin.
Submitted by: Stephane Bailliez [sbailliez@imediation.com]
Revision Changes Path
1.2 +14 -1 jakarta-tomcat-4.0/catalina/src/bin/digest.sh
Index: digest.sh
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/digest.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- digest.sh 2001/05/22 20:37:21 1.1
+++ digest.sh 2001/08/20 18:36:04 1.2
@@ -10,7 +10,7 @@
# This script is assumed to run from the bin directory or have the
# CATALINA_HOME env variable set.
#
-# $Id: digest.sh,v 1.1 2001/05/22 20:37:21 bip Exp $
+# $Id: digest.sh,v 1.2 2001/08/20 18:36:04 bip Exp $
# -----------------------------------------------------------------------------
@@ -45,6 +45,19 @@
fi
# ----- Set Up The System Classpath -------------------------------------------
+# Cygwin support. $cygwin _must_ be set to either true or false.
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ *) cygwin=false ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$CATALINA_HOME" ] &&
+ CATALINA_HOME=`cygpath --unix "$CATALINA_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
CP="$CATALINA_HOME/server/lib/catalina.jar"