svn commit: r1050471 - in /incubator/whirr/trunk: CHANGES.txt bin/whirr

[to...@apache.org]

Author: tomwhite
Date: Fri Dec 17 19:22:29 2010
New Revision: 1050471

URL: http://svn.apache.org/viewvc?rev=1050471&view=rev
Log:
WHIRR-156. Cli script doesn't launch post-modularization.

Modified:
    incubator/whirr/trunk/CHANGES.txt
    incubator/whirr/trunk/bin/whirr

Modified: incubator/whirr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/CHANGES.txt?rev=1050471&r1=1050470&r2=1050471&view=diff
==============================================================================
--- incubator/whirr/trunk/CHANGES.txt (original)
+++ incubator/whirr/trunk/CHANGES.txt Fri Dec 17 19:22:29 2010
@@ -46,6 +46,9 @@ Trunk (unreleased changes)
     WHIRR-123. Cassandra integration tests hang if whirr's scripts bucket is
     missing. (tomwhite)
 
+    WHIRR-156. Cli script doesn't launch post-modularization. (Andrei Savu and
+    tomwhite via tomwhite)
+
 Release 0.2.0 - 2010-11-04
 
   NEW FEATURES

Modified: incubator/whirr/trunk/bin/whirr
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/bin/whirr?rev=1050471&r1=1050470&r2=1050471&view=diff
==============================================================================
--- incubator/whirr/trunk/bin/whirr (original)
+++ incubator/whirr/trunk/bin/whirr Fri Dec 17 19:22:29 2010
@@ -18,4 +18,14 @@
 bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 
-java -jar $bin/../whirr-cli-*.jar "$@"
+release_jar=$bin/../whirr-cli-*.jar
+snapshot_jar=$bin/../cli/target/whirr-cli-*-SNAPSHOT.jar
+
+if [ -f $release_jar ]; then
+  java -jar $release_jar "$@"
+elif [ -f $snapshot_jar ]; then
+  java -jar $snapshot_jar "$@"
+else
+  echo "No CLI JAR found."
+  exit 1
+fi