Commit fa6c1fd
Stefan Matthias Aust
fix cygwin path problems
git-svn-id: http://svn.codehaus.org/jruby/trunk/jruby@1561 961051c9-f516-0410-bf72-c9f7e237a7b71 parent 4c86d8e commit fa6c1fd
1 file changed
Lines changed: 19 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -46,6 +46,10 @@ if [ -z "$JRUBY_HOME" ] ; then | |||
| 46 | 46 | if [ -d ${JRUBY_HOME_1}/lib ] ; then | |
| 47 | 47 | JRUBY_HOME=${JRUBY_HOME_1} | |
| 48 | 48 | fi | |
| 49 | + else | ||
| 50 | + if $cygwin; then | ||
| 51 | + JRUBY_HOME=`cygpath -u "$JRUBY_HOME"` | ||
| 52 | + fi | ||
| 49 | 53 | fi | |
| 50 | 54 | ||
| 51 | 55 | if [ -z "$JRUBY_OPTS" ] ; then | |
@@ -55,12 +59,19 @@ fi | |||
| 55 | 59 | if [ -z "$JAVA_HOME" ] ; then | |
| 56 | 60 | echo You must set JAVA_HOME to point at your Java Development Kit installation | |
| 57 | 61 | exit 1 | |
| 62 | + else | ||
| 63 | + if $cygwin; then | ||
| 64 | + JAVA_HOME=`cygpath -u "$JAVA_HOME"` | ||
| 65 | + fi | ||
| 58 | 66 | fi | |
| 59 | 67 | ||
| 60 | 68 | # ----- Set Up The System Classpath ------------------------------------------- | |
| 61 | 69 | ||
| 62 | 70 | if [ "$CLASSPATH" != "" ]; then | |
| 63 | 71 | CP="$CLASSPATH" | |
| 72 | + if $cygwin; then | ||
| 73 | + CP=`cygpath -p -u "$CP"` | ||
| 74 | + fi | ||
| 64 | 75 | else | |
| 65 | 76 | CP="" | |
| 66 | 77 | fi | |
@@ -75,7 +86,6 @@ if [ -z "$JRUBY_BASE" ] ; then | |||
| 75 | 86 | JRUBY_BASE=$JRUBY_HOME | |
| 76 | 87 | fi | |
| 77 | 88 | ||
| 78 | - | ||
| 79 | 89 | # ----- Execute The Requested Command ----------------------------------------- | |
| 80 | 90 | ||
| 81 | 91 | DEBUG="" | |
@@ -95,8 +105,10 @@ else | |||
| 95 | 105 | fi | |
| 96 | 106 | ||
| 97 | 107 | if $cygwin; then | |
| 98 | - JAVA_HOME=`cygpath --windows "$JAVA_HOME"` | ||
| 99 | - CP=`cygpath --path --windows "$CP"` | ||
| 108 | + JAVA_HOME=`cygpath --mixed "$JAVA_HOME"` | ||
| 109 | + CP=`cygpath --path --mixed "$CP"` | ||
| 110 | + JRUBY_BASE=`cygpath --mixed "$JRUBY_BASE"` | ||
| 111 | + JRUBY_HOME=`cygpath --mixed "$JRUBY_HOME"` | ||
| 100 | 112 | fi | |
| 101 | 113 | ||
| 102 | 114 | EN_US= | |
@@ -105,10 +117,10 @@ if [ "$1" = "EN_US" ]; then | |||
| 105 | 117 | shift | |
| 106 | 118 | fi | |
| 107 | 119 | ||
| 108 | - $JAVA_HOME/bin/java $DEBUG -classpath "$CP" \ | ||
| 109 | - -Djruby.base=$JRUBY_BASE \ | ||
| 110 | - -Djruby.home=$JRUBY_HOME \ | ||
| 111 | - -Djruby.lib=$JRUBY_BASE/lib \ | ||
| 120 | + $JAVA_HOME/bin/java $DEBUG -ea -classpath "$CP" \ | ||
| 121 | + "-Djruby.base=$JRUBY_BASE" \ | ||
| 122 | + "-Djruby.home=$JRUBY_HOME" \ | ||
| 123 | + "-Djruby.lib=$JRUBY_BASE/lib" \ | ||
| 112 | 124 | -Djruby.script=jruby.sh \ | |
| 113 | 125 | -Djruby.shell=/bin/sh \ | |
| 114 | 126 | $EN_US \ | |
0 commit comments