From 2946abc3d6a095e5fa6f14fb3344ac43dfef23d1 Mon Sep 17 00:00:00 2001
From: Louwrentius <Louwrentius@7749c172-d934-11dd-87b6-9d1a99559f42>
Date: Sun, 13 Feb 2011 22:53:30 +0000
Subject: [PATCH] Fixed some bugs

---
 ppss         | 12 +++++++++---
 ppss-test.sh |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ppss b/ppss
index a3af490..2071e9c 100755
--- a/ppss
+++ b/ppss
@@ -26,7 +26,7 @@
 trap 'kill_process' SIGINT 
 
 SCRIPT_NAME="Distributed Parallel Processing Shell Script"
-SCRIPT_VERSION="2.85"
+SCRIPT_VERSION="2.86"
 
 #
 # The first argument to this script can be a mode.
@@ -119,7 +119,7 @@ REMOTE_OUTPUT_DIR=""                    # Remote directory to which output must
 SCRIPT=""                               # Custom user script that is executed by ppss.
 ITEM_ESCAPED=""
 DISABLE_SKIPPING=0
-NODE_STATUS="$PPSS_DIR/status.txt"
+NODE_STATUS="$PPSS_DIR/$HOSTNAME-status.txt"
 DAEMON=0
 EMAIL=""
 
@@ -373,6 +373,11 @@ exec_cmd () {
     CMD="$1"
     NOMP="$2" # Disable multiplexing.
 
+    if [[ "$ARCH" == "FreeBSD" ]]
+    then
+        CMD="bash $CMD"
+    fi
+
     if [ ! -z "$SSH_SERVER" ] 
     then
         if [ -z "$NOMP" ]
@@ -2677,7 +2682,8 @@ start_all_workers () {
 get_status_of_node () {
 
     NODE="$1"
-    STATUS=`ssh -o ConnectTimeout=10 $SSH_KEY $USER@$NODE cat "$PPSS_HOME_DIR/$NODE_STATUS" 2>/dev/null`
+    NODE_HOSTNAME=`ssh -o ConnectTimeout=10 $SSH_KEY $USER@NODE hostname`
+    STATUS=`ssh -o ConnectTimeout=10 $SSH_KEY $USER@$NODE cat "$PPSS_HOME_DIR/$NODE_HOSTNAME-status.txt" 2>/dev/null`
     ERROR="$?"
     if [ ! "$ERROR" == "0" ]
     then
diff --git a/ppss-test.sh b/ppss-test.sh
index fcacd6c..e1d58ba 100755
--- a/ppss-test.sh
+++ b/ppss-test.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DEBUG="$1"
-VERSION="2.85"
+VERSION="2.86"
 TMP_DIR="/tmp/ppss"
 PPSS=./ppss
 PPSS_DIR=ppss_dir