Author: asavu
Date: Mon Feb 20 22:37:29 2012
New Revision: 1291495
URL: http://svn.apache.org/viewvc?rev=1291495&view=rev
Log:
WHIRR-460. Error while running whirr on Cygwin (Akash Ashok via asavu)
Modified:
whirr/branches/branch-0.7/CHANGES.txt
whirr/branches/branch-0.7/bin/whirr
Modified: whirr/branches/branch-0.7/CHANGES.txt
URL:
http://svn.apache.org/viewvc/whirr/branches/branch-0.7/CHANGES.txt?rev=1291495&r1=1291494&r2=1291495&view=diff
==============================================================================
--- whirr/branches/branch-0.7/CHANGES.txt (original)
+++ whirr/branches/branch-0.7/CHANGES.txt Mon Feb 20 22:37:29 2012
@@ -26,6 +26,8 @@ Release 0.7.1
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/branches/branch-0.7/bin/whirr
URL:
http://svn.apache.org/viewvc/whirr/branches/branch-0.7/bin/whirr?rev=1291495&r1=1291494&r2=1291495&view=diff
==============================================================================
--- whirr/branches/branch-0.7/bin/whirr (original)
+++ whirr/branches/branch-0.7/bin/whirr Mon Feb 20 22:37:29 2012
@@ -31,11 +31,23 @@ done;
BIN=$(cd $(dirname "$SOURCE"); 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
"$@"
