From cd696b13f3b712431a71f6433c796c8b9c25c680 Mon Sep 17 00:00:00 2001 From: ucar-tmeyer Date: Mon, 4 Dec 2023 16:56:23 +0000 Subject: [PATCH] Verson 20.3.2-1 updates and update installer script --- awips_install-v20.sh | 8 ++++---- build/buildEnvironment.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/awips_install-v20.sh b/awips_install-v20.sh index f7a494b410..f6951eb590 100755 --- a/awips_install-v20.sh +++ b/awips_install-v20.sh @@ -3,8 +3,8 @@ # devorg: Unidata Program Center # author: Michael James, Tiffany Meyer # maintainer: -# Date Updated: 7/10/2023 -# use: ./awips_install.sh (--cave|--edex|--database|--ingest|--help) +# Date Updated: 11/22/2023 +# use: ./awips_install-v20.sh (--cave|--edex|--database|--ingest|--help) dir="$( cd "$(dirname "$0")" ; pwd -P )" @@ -98,7 +98,6 @@ function check_wgrib2 { } function check_cave { - check_edex if [[ $(rpm -qa | grep awips2-cave-20) ]]; then echo $'\n'CAVE is currently installed and needs to be removed before installing. pkill cave.sh @@ -121,7 +120,7 @@ function check_cave { function remove_cave { yum groupremove awips2-cave -y - yum remove awips2-* -y + #yum remove awips2-* -y if [[ $(rpm -qa | grep awips2-cave) ]]; then echo " @@ -432,6 +431,7 @@ case $key in ;; --server|--edex) server_prep + yum install awips2-*post* -y yum groupinstall awips2-server -y 2>&1 | tee -a /tmp/awips-install.log sed -i 's/enabled=1/enabled=0/' /etc/yum.repos.d/awips2.repo sed -i 's/@LDM_PORT@/388/' /awips2/ldm/etc/registry.xml diff --git a/build/buildEnvironment.sh b/build/buildEnvironment.sh index cc959b3e4c..22aeb741d9 100755 --- a/build/buildEnvironment.sh +++ b/build/buildEnvironment.sh @@ -1,7 +1,7 @@ #!/bin/bash # Version export AWIPSII_VERSION="20.3.2" -export AWIPSII_RELEASE="0.4" +export AWIPSII_RELEASE="1" export AWIPSII_BUILD_DATE=`date` export AWIPSII_BUILD_SYS=`cat /etc/system-release` # Author