Merge pull request #451 from tiffanycmeyer13/unidata_18.2.1

Small Updates to install script and upperair menu (added pirep)

awips_install.sh

@@ -386,36 +386,49 @@ function cave_prep {
  rm -rf /home/awips/caveData 
 }
 
+function cleanup {
+  sed -i 's/enabled=1/enabled=0/' /etc/yum.repos.d/awips2.repo
+  if $alterReg; then
+    sed -i 's/@LDM_PORT@/388/' /awips2/ldm/etc/registry.xml 
+  fi
+  if $disableNDM; then
+    disable_ndm_update
+  fi
+  echo "$k has finished installing, the install log can be found in /tmp/awips-install.log"
+}
+
 if [ $# -eq 0 ]; then
   key="-h"
 else
   key="$1"
 fi
+
+disableNDM=true
+alterReg=true
+
 case $key in
     --cave)
         cave_prep
         yum groupinstall awips2-cave -y 2>&1 | tee -a /tmp/awips-install.log
-        echo "CAVE has finished installing, the install log can be found in /tmp/awips-install.log"
+        alterReg=false
+        disableNDM=false
+        k="CAVE"
         ;;
     --server|--edex)
         server_prep
         yum groupinstall awips2-server -y 2>&1 | tee -a /tmp/awips-install.log
-        sed -i 's/@LDM_PORT@/388/' /awips2/ldm/etc/registry.xml 
-        echo "EDEX server has finished installing, the install log can be found in /tmp/awips-install.log"
+        disableNDM=false
+        k="EDEX server"
         ;;
     --database)
         server_prep
         yum groupinstall awips2-database -y 2>&1 | tee -a /tmp/awips-install.log
-        disable_ndm_update
-        sed -i 's/@LDM_PORT@/388/' /awips2/ldm/etc/registry.xml 
-        echo "EDEX database has finished installing, the install log can be found in /tmp/awips-install.log"
+        k="EDEX database"
         ;;
     --ingest)
         server_prep
         yum groupinstall awips2-ingest -y 2>&1 | tee -a /tmp/awips-install.log
-        disable_ndm_update
-        sed -i 's/@LDM_PORT@/388/' /awips2/ldm/etc/registry.xml 
-        echo "EDEX ingest has finished installing, the install log can be found in /tmp/awips-install.log"
+        k="EDEX ingest"
         ;;
     -h|--help)
         echo -e $usage
@@ -423,6 +436,8 @@ case $key in
         ;;
 esac
 
+cleanup
+
 PATH=$PATH:/awips2/edex/bin/
 exit
 

cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/index.xml

@@ -26,5 +26,6 @@
     <include installTo="menu:upperAir?before=RADAR" fileName="menus/upperair/baseUpperAir.xml" />
     <include installTo="menu:upperAir?after=RADAR" fileName="menus/upperair/baseRadar.xml" />
     <include subMenu="MDCRS plots" installTo="menu:upperAir?before=AircraftMenuEnd" fileName="menus/upperair/baseMDCRS.xml" />
+    <include subMenu="PIREP plots" installTo="menu:upperAir?before=AircraftMenuEnd" fileName="menus/upperair/basePirep.xml" />
     <include installTo="menu:upperAir?before=AircraftMenuEnd" fileName="menus/upperair/baseAviation.xml" />
 </menuContributionFile>