From d19b106c1212fdb2fa67b077ae1ac098e879ee37 Mon Sep 17 00:00:00 2001 From: ucar-tmeyer Date: Tue, 31 Jan 2023 18:41:04 +0000 Subject: [PATCH 1/2] Updates to linux CAVE start up to remove access print statements and default locations --- cave/build/static/linux/cave/cave.png | Bin 0 -> 3616 bytes cave/build/static/linux/cave/cave.sh | 23 +---------------------- cave/build/static/linux/cave/caveUtil.sh | 9 ++++----- 3 files changed, 5 insertions(+), 27 deletions(-) create mode 100755 cave/build/static/linux/cave/cave.png diff --git a/cave/build/static/linux/cave/cave.png b/cave/build/static/linux/cave/cave.png new file mode 100755 index 0000000000000000000000000000000000000000..14240043f00e96feda9ace4f3e7abaee03cb344c GIT binary patch literal 3616 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 JmzlUl{|8FqKLP*% literal 0 HcmV?d00001 diff --git a/cave/build/static/linux/cave/cave.sh b/cave/build/static/linux/cave/cave.sh index 53ebeb44f4..07e22c5d2e 100644 --- a/cave/build/static/linux/cave/cave.sh +++ b/cave/build/static/linux/cave/cave.sh @@ -110,28 +110,7 @@ if [ $? -ne 0 ]; then fi SWITCHES=($SWITCHES) -TESTCHECK="$TMCP_HOME/bin/getTestMode" -if [ -x ${TESTCHECK} ]; then - echo "Calling getTestMode()" - ${TESTCHECK} - status=${?} - if [ $status -eq 11 ]; then - MODE="TEST" - SWITCHES+=(-mode TEST) - elif [ $status -eq 12 ];then - MODE="PRACTICE" - SWITCHES+=(-mode PRACTICE) - elif [ $status -eq 15 ];then - MODE="OPERATIONAL" - SWITCHES+=(-mode OPERATIONAL) - else - MODE="OPERATIONAL (no response)" - fi - echo "getTestMode() returned ${MODE}" -else - MODE="UNKNOWN" - echo "getTestMode() not found - going to use defaults" -fi +MODE="PRACTICE" VERSION_ARGS=() if [ -f ${CAVE_INSTALL}/awipsVersion.txt ]; then diff --git a/cave/build/static/linux/cave/caveUtil.sh b/cave/build/static/linux/cave/caveUtil.sh index fa9bcd9505..094446111c 100644 --- a/cave/build/static/linux/cave/caveUtil.sh +++ b/cave/build/static/linux/cave/caveUtil.sh @@ -47,6 +47,7 @@ # simultaneous purges. Allow override of days to keep. # Jan 26, 2017 #6092 randerso return exitCode so it can be propagated back to through the calling processes # Oct 22, 2019 #7943 tjensen Remove -x flag from grep check in deleteOldEclipseConfigurationDirs() +# Jan 31, 2022 tiffanym@ucar.edu Clean up output when CAVE is started ######################## source /awips2/cave/iniLookup.sh @@ -418,9 +419,7 @@ function deleteOldCaveLogs() # Purge the old logs. local n_days_to_keep=${CAVE_LOG_DAYS_TO_KEEP:-30} - echo -e "Cleaning consoleLogs: " - echo -e "find $logdir -type f -name "*.log" -mtime +$n_days_to_keep | xargs rm " - find "$logdir" -type f -name "*.log" -mtime +"$n_days_to_keep" | xargs rm + find "$logdir" -type f -name "*.log" -mtime +"$n_days_to_keep" | xargs -r rm # Record the last purge time and remove the lock file. echo $(date +%s) > "$last_purge_f" @@ -474,7 +473,7 @@ function deleteEclipseConfigurationDir() function createEclipseConfigurationDir() { local d dir id=$(hostname)-$(whoami) - for d in "/local/cave-eclipse/" "$HOME/.cave-eclipse/"; do + for d in "$HOME/.cave-eclipse/"; do if [[ $d == $HOME/* ]]; then mkdir -p "$d" || continue fi @@ -487,7 +486,7 @@ function createEclipseConfigurationDir() fi done echo "Unable to create a unique Eclipse configuration directory. Will proceed with default." >&2 - export eclipseConfigurationDir=$HOME/.cave-eclipse + export eclipseConfigurationDir=$HOME/caveData/.cave-eclipse return 1 } From 449cfcf2a00807baba2413f2896bdfd1c7c14996 Mon Sep 17 00:00:00 2001 From: ucar-tmeyer Date: Tue, 31 Jan 2023 21:41:15 +0000 Subject: [PATCH 2/2] Minor update to cave-eclipse path --- .gitignore | 2 +- build/setup.sh | 1 + cave/build/static/linux/cave/caveUtil.sh | 2 +- dist/comps.xml | 142 +++++++++++++++++++++++ 4 files changed, 145 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a7219d0232..52f3a54fd3 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,4 @@ __pycache__ build/awips-ade/RPMS/ build/logs/ cave/com.raytheon.viz.ui.personalities.awips/splash.bmp -dist/ +dist/el7* diff --git a/build/setup.sh b/build/setup.sh index 8d06f24045..28fff9ca86 100755 --- a/build/setup.sh +++ b/build/setup.sh @@ -75,6 +75,7 @@ if [[ $(whoami) == "awips" ]]; then # local build # rsync -aP dist/${os_version}- #TM#echo "rsync -aP dist/${os_version}-dev-${date} tiffanym@fserv:/share/awips2/${AWIPSII_VERSION}/linux/" #TM#rsync -aP dist/${os_version}-dev-${date} tiffanym@fserv:/share/awips2/${AWIPSII_VERSION}/linux/ + rsync -aP dist/${os_version}-dev-${date} awips@edex3:/awips2/dev rsync -aP dist/${os_version}-dev-${date} awips@hardy:/awips2/dev #repomanage -k1 --old dist/${os_version}-dev | xargs rm -f # diff --git a/cave/build/static/linux/cave/caveUtil.sh b/cave/build/static/linux/cave/caveUtil.sh index 094446111c..9824c9a894 100644 --- a/cave/build/static/linux/cave/caveUtil.sh +++ b/cave/build/static/linux/cave/caveUtil.sh @@ -473,7 +473,7 @@ function deleteEclipseConfigurationDir() function createEclipseConfigurationDir() { local d dir id=$(hostname)-$(whoami) - for d in "$HOME/.cave-eclipse/"; do + for d in "$HOME/caveData/.cave-eclipse/"; do if [[ $d == $HOME/* ]]; then mkdir -p "$d" || continue fi diff --git a/dist/comps.xml b/dist/comps.xml index c36b09105f..ce39aedb90 100755 --- a/dist/comps.xml +++ b/dist/comps.xml @@ -157,6 +157,148 @@ awips2-watchdog + + awips2-ingest + AWIPS EDEX Decode/Ingest (No Database, PyPIES, GFE) + true + This Will Install the AWIPS Components That Are Required For ingesting and decoding data (used with ancillary machine installs) + true + + awips2 + awips2-version + awips2-cli + awips2-scripts + + awips2-edex + awips2-edex-alertviz + awips2-edex-archive + awips2-edex-base + awips2-edex-binlightning + awips2-edex-bufr + awips2-edex-common-core + awips2-common-foss + awips2-common-base + awips2-edex-core + awips2-edex-registry-client + awips2-edex-datadelivery-client + awips2-edex-datadelivery-core + awips2-edex-foss + awips2-edex-foss-com-beust-jcommander + awips2-edex-foss-com-google-protobuf + awips2-edex-foss-com-mchange + awips2-edex-foss-com-sun-jna + awips2-edex-foss-edu-mit-ll-netcdf + awips2-edex-foss-javax-activation + awips2-edex-foss-javax-mail + awips2-edex-foss-javax-media-opengl + awips2-edex-foss-javax-servlet + awips2-edex-foss-net-dods + awips2-edex-foss-net-opengis + awips2-edex-foss-net-opengis_v2 + awips2-edex-foss-net-sf-ehcache + awips2-edex-foss-ogc-tools-gml + awips2-edex-foss-org-apache-activemq + awips2-edex-foss-org-apache-camel + awips2-edex-foss-org-apache-commons-cli + awips2-edex-foss-org-apache-commons-compress + awips2-edex-foss-org-apache-commons-management + awips2-edex-foss-org-apache-commons-net + awips2-edex-foss-org-apache-commons-ssl + awips2-edex-foss-org-apache-commons-validator + awips2-edex-foss-org-apache-shiro + awips2-edex-foss-org-apache-ws-commons-schema + awips2-edex-foss-org-apache-ws-security + awips2-edex-foss-org-apache-xalan + awips2-edex-foss-org-apache-xml-resolver + awips2-edex-foss-org-apache-xml-security + awips2-edex-foss-org-apache-xml-serializer + awips2-edex-foss-org-dom4j + awips2-edex-foss-org-eclipse-jetty + awips2-edex-foss-org-itadaki-bzip2 + awips2-edex-foss-org-jasypt + awips2-edex-foss-org-jfreechart + awips2-edex-foss-org-joda-time + awips2-edex-foss-org-objectweb + awips2-edex-foss-org-opensaml + awips2-edex-foss-org-w3-xmlschema + awips2-edex-foss-ucar-nc2 + awips2-edex-dat + awips2-edex-dataplugins + awips2-edex-hydro + awips2-edex-ost + awips2-edex-radar + awips2-edex-probsevere + awips2-edex-satellite + awips2-edex-warning + awips2-edex-text + awips2-edex-aviation + awips2-edex-configuration + awips2-edex-npp + awips2-edex-ncep + awips2-edex-remote-script + awips2-edex-convectprob + awips2-edex-sportlma + awips2-edex-goesr + awips2-edex-grib-decoderpostprocessor + awips2-edex-mping + awips2-edex-nswrc-radar + awips2-edex-grid + awips2-edex-ogc-core + awips2-edex-ogc-wfs + awips2-edex-glmdecoder + awips2-edex-config-auto + awips2-edex-hazards + awips2-yajsw + awips2-edex-rcm + awips2-edex-mpe + awips2-edex-geodb + awips2-ldm + + awips2-ignite + awips2-adapt-native + awips2-hydroapps-shared + awips2-java + awips2-notification + awips2-psql + pgadmin4 + awips2-python + awips2-python-jep + awips2-qpid-broker-j + awips2-qpid-proton + awips2-rcm + awips2-aviation-shared + + awips2-python-dynamicserialize + awips2-python-h5py + awips2-python-cycler + awips2-python-kiwisolver + awips2-python-backports-lru_cache + awips2-python-matplotlib + awips2-python-setuptools + awips2-python-numpy + awips2-qpid-proton-python + awips2-python-scipy + awips2-python-tables + awips2-python-thrift + awips2-python-tpg + awips2-python-ufpy + awips2-python-werkzeug + awips2-python-shapely + awips2-python-dateutil + awips2-python-pyparsing + awips2-python-pytz + awips2-python-six + awips2-python-pyshp + awips2-python-stomp.py + awips2-python-cftime + awips2-python-netcdf4 + awips2-hdf5 + awips2-netcdf + awips2-netcdf-devel + awips2-localapps-environment + awips2-watchdog + + awips2-cave