donaldp 2002/08/21 03:26:36 Modified: src/script phoenix.sh Log: Allow users to customize their environment variables by optionally running a setup script if present. Submitted by: Tomasz Skutnik <[EMAIL PROTECTED]> Revision Changes Path 1.3 +14 -11 jakarta-avalon-phoenix/src/script/phoenix.sh Index: phoenix.sh =================================================================== RCS file: /home/cvs/jakarta-avalon-phoenix/src/script/phoenix.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- phoenix.sh 16 Aug 2002 10:04:21 -0000 1.2 +++ phoenix.sh 21 Aug 2002 10:26:36 -0000 1.3 @@ -46,17 +46,6 @@ CYGWIN*) cygwin=true;; esac - -# Checking for JAVA_HOME is required on *nix due -# to some distributions stupidly including kaffe in /usr/bin -if [ "$JAVA_HOME" = "" ] ; then - echo "ERROR: JAVA_HOME not found in your environment." - echo - echo "Please, set the JAVA_HOME variable in your environment to match the" - echo "location of the Java Virtual Machine you want to use." - exit 1 -fi - # resolve links - $0 may be a softlink THIS_PROG="$0" @@ -75,6 +64,20 @@ PHOENIX_HOME=`cd "$PRGDIR/.." ; pwd` unset THIS_PROG + +if [ -r "$PHOENIX_HOME"/bin/setenv.sh ]; then + . "$PHOENIX_HOME"/bin/setenv.sh +fi + +# Checking for JAVA_HOME is required on *nix due +# to some distributions stupidly including kaffe in /usr/bin +if [ "$JAVA_HOME" = "" ] ; then + echo "ERROR: JAVA_HOME not found in your environment." + echo + echo "Please, set the JAVA_HOME variable in your environment to match the" + echo "location of the Java Virtual Machine you want to use." + exit 1 +fi # For Cygwin, ensure paths are in UNIX format before anything is touched if $cygwin; then
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
