From 94aadccf96c13c613070678d5ba34f2153e7de04 Mon Sep 17 00:00:00 2001
From: Derek Roberts <derek.roberts@gmail.com>
Date: Mon, 22 Jun 2015 16:37:47 -0700
Subject: [PATCH] Revised/simplified dacs_*.sh and input for pdc-env changes

---
 dacs_add.sh    | 34 ++++++++++++++--------------------
 dacs_remove.sh |  2 +-
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/dacs_add.sh b/dacs_add.sh
index 8bc4028..f420ad3 100755
--- a/dacs_add.sh
+++ b/dacs_add.sh
@@ -8,11 +8,12 @@ set -o nounset
 # Expected input
 #
 # $0 this script
-# $1 Endpoint number
-# $2 Clinician number
-# $3 Visualizer login name [optional]
-# $4 Jurisdiction [optional]
-# $5 Password [optional]
+# $1 Doctor (clinician) ID
+# $2 Clinic ID
+# $3 User name [optional]
+# $4 User role [optional]
+# $5 Jurisdiction [optional]
+# $6 Password [optional]
 
 
 # Check parameters
@@ -22,7 +23,7 @@ then
 	echo ""
 	echo "Unexpected number of parameters."
 	echo ""
-	echo "Usage: dacs_add.sh [userName] [userRole] [doctorID] [clinicID] [optional:jurisdiction] [optional:password]"
+	echo "Usage: dacs_add.sh [doctorID] [clinicID] [op:userName] [op:userRole] [op:jurisdiction] [op:password]"
 	echo ""
 	exit
 fi
@@ -30,20 +31,13 @@ fi
 
 # Set variables from parameters, prompt when password not provided
 #
-export U_NAME=${1}
-export U_ROLE=${2}
-export DOCTOR=${3}
-export CLINIC=${4}
+
+export DOCTOR=${1}
+export CLINIC=${2}
+export U_NAME=${3:-$DOCTOR}
+export U_ROLE=${4:-admin}
 export JURISDICTION=${5:-TEST}
-#
-if [ $# -eq  5 ]
-then
-	echo "Please provide a password for user "${U_NAME}":"
-	read -s PASSWORD
-	echo ""
-else
-	PASSWORD=${6}
-fi
+export PASSWORD=${6:-sample}
 
 
 # Add user to DACS
@@ -58,7 +52,7 @@ fi
 
 # Add user to DACS_ROLEFILE, notify if overwriting
 #
-if ( cat ${DACS_ROLEFILE} | grep -io ^${U_NAME}: )
+if ( cat ${DACS_ROLEFILE} | grep -qio ^${U_NAME}: )
 then
 	echo "Existing user role replaced"
 	sed -i /${U_NAME}:/d ${DACS_ROLEFILE}
diff --git a/dacs_remove.sh b/dacs_remove.sh
index 1710239..305c847 100755
--- a/dacs_remove.sh
+++ b/dacs_remove.sh
@@ -39,7 +39,7 @@ export JURISDICTION=${2:-$DACS_JURISDICTION}
 
 # Remove user from DACS_ROLEFILE
 #
-if ( cat ${DACS_ROLEFILE} | grep -io ^${U_NAME}: )
+if ( cat ${DACS_ROLEFILE} | grep -qio ^${U_NAME}: )
 then
 	sed -i /${U_NAME}:/d ${DACS_ROLEFILE}
 else