From 99a4a6a5d72ffa6bd15bfece817d685f8e653606 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Mon, 17 Jul 2017 17:36:30 -0500
Subject: [PATCH 1/3] bugfix

---
 configBuilder.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/configBuilder.sh b/configBuilder.sh
index c49122c..1db065f 100755
--- a/configBuilder.sh
+++ b/configBuilder.sh
@@ -511,8 +511,9 @@ echo ""
 echo "Creating sanitized config for hybrid build..."
 echo ""
 destPath=./ConfigNoSecrets
-cp -rf `realpath ${PWD}`/. $destPath >/dev/null 2>>/dev/null
-mkdir -p ./ConfigNoSecrets/SECRETS
+#cp -rf `realpath ${PWD}`/. $destPath >/dev/null 2>>/dev/null
+rsync -a . ./testCPNS --exclude ${destPath}
+mkdir -p ./${destPath}/SECRETS
 
 # move secrets
 mv -f $destPath/config/shib-idp/conf/idp.properties $destPath/SECRETS/idp.properties > /dev/null

From 698be58313c5d52599292bf3436a3d9f55c5673d Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Mon, 17 Jul 2017 17:40:37 -0500
Subject: [PATCH 2/3] bugfixes

---
 configBuilder.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/configBuilder.sh b/configBuilder.sh
index 1db065f..2b95541 100755
--- a/configBuilder.sh
+++ b/configBuilder.sh
@@ -511,8 +511,10 @@ echo ""
 echo "Creating sanitized config for hybrid build..."
 echo ""
 destPath=./ConfigNoSecrets
-#cp -rf `realpath ${PWD}`/. $destPath >/dev/null 2>>/dev/null
-rsync -a . ./testCPNS --exclude ${destPath}
+destPathName=ConfigNoSecrets
+# check for rsync
+command -v rsync >/dev/null 2>&1 || { echo >&2 "ERROR: rsync is required, but doesn't appear to be installed.  Aborting..."; exit 1; }
+rsync -a . ${destPath} --exclude ${destPathName}
 mkdir -p ./${destPath}/SECRETS
 
 # move secrets

From f254d8222d6d3f1dea9e994978d3349624c2af91 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Mon, 17 Jul 2017 17:41:30 -0500
Subject: [PATCH 3/3] bug

---
 configBuilder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configBuilder.sh b/configBuilder.sh
index 2b95541..f49517c 100755
--- a/configBuilder.sh
+++ b/configBuilder.sh
@@ -515,7 +515,7 @@ destPathName=ConfigNoSecrets
 # check for rsync
 command -v rsync >/dev/null 2>&1 || { echo >&2 "ERROR: rsync is required, but doesn't appear to be installed.  Aborting..."; exit 1; }
 rsync -a . ${destPath} --exclude ${destPathName}
-mkdir -p ./${destPath}/SECRETS
+mkdir -p ${destPath}/SECRETS
 
 # move secrets
 mv -f $destPath/config/shib-idp/conf/idp.properties $destPath/SECRETS/idp.properties > /dev/null