14.1.1-5 baseline

Former-commit-id: b643d85f65fe0393024cf43473fd567d8b7b2b65

rpms/awips2.cave/Installer.alertviz/component.spec

@@ -107,12 +107,6 @@ fi
 %pre
 
 %post
-# Remove the alertviz autostart script if we have been
-# installed on an xt machine.
-if [ "`hostname | cut -b 1-2`" = "xt" ]; then
-   # Remove the awips2-alertviz autostart script.
-   rm -f /etc/xdg/autostart/awips2-alertviz.desktop
-fi
 
 %preun
 %postun

rpms/awips2.cave/Installer.cave/scripts/autostart/awips2-textws.desktop

@@ -4,4 +4,4 @@ Encoding=UTF-8
 Version=1.0
 Name=No Name
 Name[en_US]=TextWS
-Exec=/bin/bash -i -c "/awips2/alertviz/alertviz.sh &"; /bin/csh -i -c "/awips2/cave/textWS.sh"
+Exec=/bin/bash -i -c "sleep 5; /awips2/cave/textWS.sh"

rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.csh

@@ -6,10 +6,7 @@ set RC="$?"
 
 #if installed, set the variable
 if ( "${RC}" == "0" ) then
-	set CLI_INSTALL=`rpm -q --queryformat '%{INSTALLPREFIX}' awips2-cli`
-	#if check CLI_INSTALL is set, set it in the path
-	if ( "${CLI_INSTALL}" != "" ) then
-		setenv PATH ${CLI_INSTALL}/bin:${PATH}
-	endif
+	set CLI_INSTALL=/awips2/fxa
+	setenv PATH ${CLI_INSTALL}/bin:${PATH}
 endif
 

rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.sh

@@ -9,9 +9,5 @@ if [ ! "${RC}" = "0" ]; then
 fi
 
 # Determine where awips2-cli has been installed.
-CLI_INSTALL=`rpm -q --queryformat '%{INSTALLPREFIX}\n' awips2-cli`
-if [ "${CLI_INSTALL}" = "" ]; then
-   return
-fi
-
+CLI_INSTALL=/awips2/fxa
 export PATH=${CLI_INSTALL}/bin:${PATH}

rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.csh

@@ -1,6 +1,6 @@
 #!/bin/csh
 
-set HDF5_TOOLS_INSTALL=`rpm -q --queryformat '%{INSTALLPREFIX}' awips2-tools`
+set HDF5_TOOLS_INSTALL=/awips2/tools
 
 if $?PATH then
    setenv PATH ${HDF5_TOOLS_INSTALL}/bin:$PATH

rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.sh

@@ -8,10 +8,7 @@ if [ ${RC} -ne 0 ]; then
 fi
 
 # Determine Where awips2-tools Has Been Installed.
-HDF5_TOOLS_INSTALL=`rpm -q --queryformat '%{INSTALLPREFIX}' awips2-tools`
-if [ "${HDF5_TOOLS_INSTALL}" = "" ]; then
-   return
-fi
+HDF5_TOOLS_INSTALL=/awips2/tools
 
 # Update The Environment.
 # Determine If awips2-tools Is Already Part Of The Path.

rpms/build/x86_64/build.sh

@@ -316,7 +316,10 @@ if [ "${1}" = "-ade" ]; then
 fi
 
 if [ "${1}" = "-viz" ]; then
+   buildRPM "awips2"
    buildRPM "awips2-common-base"
+   buildRPM "awips2-tools"
+   buildRPM "awips2-cli"
    buildCAVE
    if [ $? -ne 0 ]; then
       exit 1