Skip to content

Commit

Permalink
First cut at make the clj script work in cygwin
Browse files Browse the repository at this point in the history
  • Loading branch information
russolsen committed Jun 19, 2010
1 parent 613b9d9 commit 6610daf
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions bin/clj 100755 → 100644
Expand Up @@ -76,10 +76,8 @@ done

CLOJURE_BIN=`dirname "$PRG"` # bin dir, relative
CLOJURE_BIN=`(cd "$CLOJURE_BIN"; pwd)` # bin dir, absolute path
echo $CLOJURE_BIN

CLOJURE_HOME=`dirname "$CLOJURE_BIN"`
echo $CLOJURE_HOME

# Determine what we are going to use for java,
# either from JAVA_HOME or from the path
Expand Down Expand Up @@ -226,6 +224,12 @@ CLOJURE_CP=`add_to_path "$CLOJURE_CP" "$LIB_DIR_CP" $CP_DELIMITER`

CLOJURE_CP=`add_to_path "$CLOJURE_CP" "$USER_CP" $CP_DELIMITER`

if $cygwin; then
CLOJURE_HOME=`cygpath --windows $CLOJURE_HOME`
JAVA_CMD=`cygpath --windows $JAVA_CMD`
CLOJURE_CP=`cygpath -wp $CLOJURE_CP`
fi

$DEBUG_CMD $JAVA_CMD -DCLOJURE_HOME="$CLOJURE_HOME" \
-classpath "$CLOJURE_CP" "${JAVA_ARGS[@]}" $CLOJURE_JLINE_CLASS $CLOJURE_MAIN_CLASS "$@"

Expand Down

0 comments on commit 6610daf

Please sign in to comment.