From 789db609c9342d400d87c95e68e1f139a7dd6098 Mon Sep 17 00:00:00 2001
From: Louwrentius <Louwrentius@7749c172-d934-11dd-87b6-9d1a99559f42>
Date: Mon, 1 Mar 2010 22:07:19 +0000
Subject: [PATCH] Fixed ec2 error on non-ec2 deployment

---
 ppss         | 8 ++++----
 ppss-test.sh | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ppss b/ppss
index 4c13f8e..b9672ae 100755
--- a/ppss
+++ b/ppss
@@ -843,7 +843,7 @@ ec2_launch_nodes() {
     # Write all instances / nodes to the nodes file.
     #
     ec2-describe-instances | grep 'INSTANCE' | awk '{print $4}' | sed '/terminated/d' | sed '/pending/d' >> $NODES_FILE
-    NO_OF_NODES="`wc -l $NODES_FILE`"
+    NO_OF_NODES="`wc -l $NODES_FILE | awk '{ print $1 }'`"
     log DSPLY "Number of nodes / instances: $NO_OF_NODES"
 }
 
@@ -948,7 +948,7 @@ deploy_ppss () {
         cleanup
         exit 1
     else
-	if [ -z "$EC2" ]
+	if [ "$EC2" == "1" ]
 	then
 		ec2_launch_nodes
 	fi
@@ -1918,8 +1918,8 @@ main () {
                     cleanup
                     exit 0
                     ;;
-	ec2)
-                    EC2=true
+	        ec2)
+                    EC2=1
                     LOGFILE=/dev/null
                     display_header
                     log INFO "Deploying PPSS on EC2 nodes."
diff --git a/ppss-test.sh b/ppss-test.sh
index 503d3c1..57b647f 100755
--- a/ppss-test.sh
+++ b/ppss-test.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DEBUG="$1"
-VERSION="2.56b4"
+VERSION="2.57b1"
 TMP_DIR="ppss"
 PPSS=./ppss
 PPSS_DIR=ppss_dir