Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Pearce2015-01-27 05:51:18 +0000
committerGerrit Code Review @ Eclipse.org2015-01-27 05:51:18 +0000
commite463fdef1549b7a9a23440ff61851eecf106963e (patch)
tree4c0155a11034c755741eec1e9adf462e801f6d76
parent9a2c5068450fd34477872f4a8c9876619da3d8b4 (diff)
parent145b1bf0fbe2a63e1ac3fb0c9b527968eeec1f39 (diff)
downloadjgit-e463fdef1549b7a9a23440ff61851eecf106963e.tar.gz
jgit-e463fdef1549b7a9a23440ff61851eecf106963e.tar.xz
jgit-e463fdef1549b7a9a23440ff61851eecf106963e.zip
Merge "Make jgit.sh work on windows when JGIT_CLASSPATH is set"
-rw-r--r--org.eclipse.jgit.pgm/jgit.sh8
1 files changed, 6 insertions, 2 deletions
diff --git a/org.eclipse.jgit.pgm/jgit.sh b/org.eclipse.jgit.pgm/jgit.sh
index 6b9ce40e9b..826714751c 100644
--- a/org.eclipse.jgit.pgm/jgit.sh
+++ b/org.eclipse.jgit.pgm/jgit.sh
@@ -61,14 +61,18 @@ this_script=`which "$0" 2>/dev/null`
[ $? -gt 0 -a -f "$0" ] && this_script="$0"
cp=$this_script
+platform="`uname`"
if [ -n "$JGIT_CLASSPATH" ]
then
- cp="$cp:$JGIT_CLASSPATH"
+ cp_sep=:
+ # On Windows & MingW use ";" to separate classpath entries
+ [ "${platform#MINGW}" != "$platform" ] && cp_sep=";"
+ cp="$cp$cp_sep$JGIT_CLASSPATH"
fi
# Cleanup paths for Cygwin.
#
-case "`uname`" in
+case "$platform" in
CYGWIN*)
cp=`cygpath --windows --mixed --path "$cp"`
;;

Back to the top