From efa90dc8bc513c58c9dbdb5eaf1a122daf4b30db Mon Sep 17 00:00:00 2001
From: mjames-upc <mjames@unidata.ucar.edu>
Date: Tue, 20 Oct 2015 13:46:27 -0600
Subject: [PATCH] install scrip updates

Former-commit-id: 1c153f42ae2277f3666a4c233c7ceb21c40b2a04
Former-commit-id: 591aeb6e577a67279061e87ceffb8564649321dc
---
 installCAVE.sh | 28 +++++++++++++++++++++++-----
 installEDEX.sh | 21 ++++++++++++++++-----
 2 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/installCAVE.sh b/installCAVE.sh
index 7d62801d5d..059265b704 100644
--- a/installCAVE.sh
+++ b/installCAVE.sh
@@ -5,16 +5,35 @@
 #
 # 10/15         mjames@ucar.edu         Creation
 #
+
+#
+##  Download awips2.repo from the Unidata web server
+# 
+
 if [ ! -f /etc/yum.repos.d/awips2.repo ]; then
   echo ''
   echo 'Downloading awips2repo yum file to /etc/yum.repos.d/awips2.repo'
   echo ''
   wget -O /etc/yum.repos.d/awips2.repo http://www.unidata.ucar.edu/software/awips2/doc/awips2.repo
+  echo "Running 'yum clean all'"
+  yum clean all
+  echo ''
 fi
-echo ''
-echo "Running 'yum clean all'"
-echo ''
-yum clean all
+
+##
+## If CAVE is not installed them make sure /awips2/cave/
+## and /awips2/alertviz/ are removed before installing.
+##
+
+if [[ $(rpm -qa | grep awips2-cave) ]]; then
+  echo "found CAVE RPMs installed"
+else
+  echo "  CAVE RPMs not installled"
+  echo ""
+  echo "  cleaning up /awips2/cave/, /awips2/alertviz/"
+  rm -rf /awips2/cave/ /awips2/alertviz/
+fi
+
 echo ''
 echo "Running 'yum groupinstall awips2-cave'"
 echo ''
@@ -36,5 +55,4 @@ echo ""
 echo "  to run cave:"
 echo ""
 echo "  /awips2/cave/cave.sh"
-echo ""
 exit
diff --git a/installEDEX.sh b/installEDEX.sh
index 0b1027b1f5..306d23dbbf 100644
--- a/installEDEX.sh
+++ b/installEDEX.sh
@@ -15,6 +15,22 @@ echo ''
 echo "Running 'yum clean all'"
 echo ''
 yum clean all
+
+
+if [[ $(rpm -qa | grep awips2-edex) ]]; then
+  echo "found EDEX RPMs installed"
+else
+  echo "  EDEX RPMs not installled"
+  echo ""
+  echo "  cleaning up /awips2/edex/, /awips2/data/"
+  rm -rf /awips2/edex/ /awips2/data/
+fi
+
+service edex_camel stop
+service qpidd stop
+service httpd-pypies stop
+service edex_postgres stop
+
 echo ''
 echo "Running 'yum groupinstall awips2-server'"
 echo ''
@@ -30,9 +46,4 @@ fi
 echo ""
 echo "Done..."
 echo ""
-echo "  to run EDEX:"
-echo ""
-echo "  edex start"
-echo '  su ldm -c "ldmadmin mkqueue" && su ldm -c "ldmadmin start"'
-echo ""
 exit