From d95ea43871955b6daa71b535f33b9a6fdcc30feb Mon Sep 17 00:00:00 2001
From: ThejanW <thejanwijesinghe.14@cse.mrt.ac.lk>
Date: Wed, 4 Apr 2018 15:55:58 +0530
Subject: [PATCH] update filemgr, wmgr & resmgr scripts

---
 .../filemgr/src/main/resources/bin/filemgr                    | 4 ++--
 .../archetype-resources/resmgr/src/main/resources/bin/resmgr  | 3 ++-
 .../archetype-resources/workflow/src/main/resources/bin/wmgr  | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/bin/filemgr b/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/bin/filemgr
index 1ef51fd01..76c24fbaf 100644
--- a/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/bin/filemgr
+++ b/mvn/archetypes/radix/src/main/resources/archetype-resources/filemgr/src/main/resources/bin/filemgr
@@ -119,8 +119,8 @@ elif [ "$1" = "stop" ]; then
     if [ -f "$FILEMGR_PID" ]; then
       kill `cat $FILEMGR_PID` >/dev/null 2>&1
       if [ $? -eq 1 ]; then
-        echo "ID file ($FILEMGR_PID) found with PID `cat $FILEMGR_PID` but no matching process was found. Removed $FILEMGR_PID, now FileManager can be started."
-        `rm $FILEMGR_PID`
+        echo "PID file ${FILEMGR_PID} found with PID `cat $FILEMGR_PID` but no matching process was found. Removed ${FILEMGR_PID}, now File Manager can be started."
+        rm ${FILEMGR_PID}
         exit 1
       fi
     else
diff --git a/mvn/archetypes/radix/src/main/resources/archetype-resources/resmgr/src/main/resources/bin/resmgr b/mvn/archetypes/radix/src/main/resources/archetype-resources/resmgr/src/main/resources/bin/resmgr
index 7bd9db74e..a3ccf5f49 100755
--- a/mvn/archetypes/radix/src/main/resources/archetype-resources/resmgr/src/main/resources/bin/resmgr
+++ b/mvn/archetypes/radix/src/main/resources/archetype-resources/resmgr/src/main/resources/bin/resmgr
@@ -125,7 +125,8 @@ elif [ "$1" = "stop" ]; then
     if [ -f "$RESMGR_PID" ]; then
       kill `cat $RESMGR_PID` >/dev/null 2>&1
       if [ $? -eq 1 ]; then
-        echo "PID file ($RESMGR_PID) found but no matching process was found. Stop aborted."
+        echo "PID file ${RESMGR_PID} found with PID `cat $RESMGR_PID` but no matching process was found. Removed ${RESMGR_PID}, now Resource Manager can be started."
+        rm ${RESMGR_PID}
         exit 1
       fi
     else
diff --git a/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/bin/wmgr b/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/bin/wmgr
index 766b5e22b..6275bd5d8 100644
--- a/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/bin/wmgr
+++ b/mvn/archetypes/radix/src/main/resources/archetype-resources/workflow/src/main/resources/bin/wmgr
@@ -120,7 +120,8 @@ elif [ "$1" = "stop" ]; then
     if [ -f "$WORKFLOW_PID" ]; then
       kill `cat $WORKFLOW_PID` >/dev/null 2>&1
       if [ $? -eq 1 ]; then
-        echo "PID file ($WORKFLOW_PID) found but no matching process was found. Stop aborted."
+        echo "PID file ${WORKFLOW_PID} found with PID `cat $WORKFLOW_PID` but no matching process was found. Removed ${WORKFLOW_PID}, now Workflow Manager can be started."
+        rm ${WORKFLOW_PID}
         exit 1
       fi
     else