[Jython-checkins] SF.net SVN: jython:[4968] branches/asm/src/shell/jython

[<nr...@us...>]

Revision: 4968
          http://jython.svn.sourceforge.net/jython/?rev=4968&view=rev
Author:   nriley
Date:     2008-07-18 19:20:39 +0000 (Fri, 18 Jul 2008)

Log Message:
-----------
Work with jython-complete.jar; handle spaces in $JAVA_HOME.

Modified Paths:
--------------
    branches/asm/src/shell/jython

Modified: branches/asm/src/shell/jython
===================================================================
--- branches/asm/src/shell/jython	2008-07-18 00:28:49 UTC (rev 4967)
+++ branches/asm/src/shell/jython	2008-07-18 19:20:39 UTC (rev 4968)
@@ -34,6 +34,15 @@
   fi
 done
 
+if [ -z "$JAVA_HOME" ] ; then
+  JAVA_CMD=(java)
+else
+  if $cygwin; then
+    JAVA_HOME=`cygpath -u "$JAVA_HOME"`
+  fi
+  JAVA_CMD=("$JAVA_HOME/bin/java")
+fi
+
 if [ -z "$JYTHON_HOME" ] ; then
   JYTHON_HOME_1=`dirname "$PRG"`           # the ./bin dir
   JYTHON_HOME=`dirname "$JYTHON_HOME_1"`   # the . dir
@@ -43,35 +52,28 @@
   JYTHON_OPTS=""
 fi
 
-if [ -z "$JAVA_HOME" ] ; then
-  JAVA_CMD='java'
-else
-  if $cygwin; then
-    JAVA_HOME=`cygpath -u "$JAVA_HOME"`
-  fi
-  JAVA_CMD="$JAVA_HOME/bin/java"
-fi
-
 CP_DELIMITER=":"
 
 CP=$JYTHON_HOME/jython.jar
 
-if [ ! -f "$CP" ]; then
-  echo "$0: '$CP' does not exist." >&2
+if [ -f "$CP" ] ; then
+  # add necessary jars for command-line execution
+  for j in "$JYTHON_HOME"/javalib/*.jar; do
+    if [ "$CP" ]; then
+      CP="$CP$CP_DELIMITER$j"
+    else
+      CP="$j"
+    fi
+  done
+elif [ ! -f "$JYTHON_HOME"/jython-complete.jar ] ; then
+  echo "$0: $JYTHON_HOME contains neither jython.jar nor jython-complete.jar." >&2
   echo "Try running this script from the 'bin' directory of an installed Jython or " >&2
   echo 'setting $JYTHON_HOME.' >&2
   exit 1
+else
+  CP=$JYTHON_HOME/jython-complete.jar
 fi
 
-# add necessary jars for command-line execution
-for j in "$JYTHON_HOME"/javalib/*.jar; do
-  if [ "$CP" ]; then
-    CP="$CP$CP_DELIMITER$j"
-  else
-    CP="$j"
-  fi
-done
-
 if $cygwin; then
   CP=`cygpath -wp "$CP"`
   PRG=`cygpath -w "$PRG"`
@@ -119,12 +121,12 @@
     # Run under JDB
     --jdb)
       if [ -z "$JAVA_HOME" ] ; then
-	JAVA_CMD='jdb'
+	JAVA_CMD=(jdb)
       else
 	if $cygwin; then
 	  JAVA_HOME=`cygpath -u "$JAVA_HOME"`
 	fi
-	JAVA_CMD="$JAVA_HOME/bin/jdb"
+	JAVA_CMD=("$JAVA_HOME/bin/jdb")
       fi
       ;;
     -h|--help)
@@ -172,12 +174,12 @@
   java_args=("${java_args[@]}" -classpath "$CP$CP_DELIMITER$CLASSPATH")
 else
   if [ -z $help_requested ] ; then
-    JAVA_CMD="exec $JAVA_CMD"
+    JAVA_CMD=(exec "${JAVA_CMD[@]}")
   fi
   java_args=("${java_args[@]}" -Xbootclasspath/a:"$CP" -classpath "$CLASSPATH")
 fi
 
-$JAVA_CMD $JAVA_OPTS "${java_args[@]}" -Dpython.home="$JYTHON_HOME" \
+"${JAVA_CMD[@]}" $JAVA_OPTS "${java_args[@]}" -Dpython.home="$JYTHON_HOME" \
   -Dpython.executable="$PRG" org.python.util.jython $JYTHON_OPTS "$@"
 
 if [ -n "$profile_requested" ] ; then


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.