WHIRR-156. Cli script doesn't launch post-modularization.

git-svn-id: https://svn.apache.org/repos/asf/incubator/whirr/trunk@1050471 13f79535-47bb-0310-9956-ffa450edef68
atiw003 · Dec 17, 2010 · 7e24ebe · 7e24ebe
1 parent 905a6b5
commit 7e24ebe
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -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

diff --git a/bin/whirr b/bin/whirr
@@ -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