Author: asavu
Date: Thu Jan 5 19:13:10 2012
New Revision: 1227771
URL: http://svn.apache.org/viewvc?rev=1227771&view=rev
Log:
WHIRR-460. Error while running whirr on Cygwin (Akash Ashok via asavu)
Modified:
whirr/trunk/CHANGES.txt
whirr/trunk/bin/whirr
Modified: whirr/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/whirr/trunk/CHANGES.txt?rev=1227771&r1=1227770&r2=1227771&view=diff
==============================================================================
--- whirr/trunk/CHANGES.txt (original)
+++ whirr/trunk/CHANGES.txt Thu Jan 5 19:13:10 2012
@@ -21,6 +21,8 @@ Trunk (unreleased changes)
WHIRR-367. Wrong groupId for zookeeper (Joe Crobak via asavu)
+ WHIRR-460. Error while running whirr on Cygwin (Akash Ashok via asavu)
+
Release 0.7.0 - 2011-12-11
NEW FEATURES
Modified: whirr/trunk/bin/whirr
URL:
http://svn.apache.org/viewvc/whirr/trunk/bin/whirr?rev=1227771&r1=1227770&r2=1227771&view=diff
==============================================================================
--- whirr/trunk/bin/whirr (original)
+++ whirr/trunk/bin/whirr Thu Jan 5 19:13:10 2012
@@ -18,11 +18,23 @@
BIN=$(cd $(dirname "$0"); pwd)
LOGGING_OPTS="-Dlog4j.configuration=log4j-cli.xml"
+# Set cygwin to true if running on Cygwin
+cygwin=false;
+case "`uname`" in
+ CYGWIN*) cygwin=true;
+esac
+
if [ -d "$BIN/../cli/target/lib" ]; then
CLASSPATH="$BIN/../conf/:$BIN/..:$BIN/../cli/target/lib/*:$BIN/../cli/target/*"
else
CLASSPATH="$BIN/../conf/:$BIN/..:$BIN/../lib/*"
fi
+# Java classpath doesn't understand cygwin paths, thus converting the
CLASSPATH into
+# Windows style path.
+if $cygwin; then
+ CLASSPATH=`cygpath -wp $CLASSPATH`;
+fi
+
java $LOGGING_OPTS $WHIRR_CLI_OPTS -cp "$CLASSPATH" org.apache.whirr.cli.Main
"$@"
