xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #2520 - Update rpm query calls" into development

Browse source 
Former-commit-id: f5440862f3 [formerly 183f46df4b] [formerly f5440862f3 [formerly 183f46df4b] [formerly 76d21878e4 [formerly d1234253ea620effba3f7bdb32f3e478562da92d]]]
Former-commit-id: 76d21878e4
Former-commit-id: 131e6c803f [formerly e604ea08f6]
Former-commit-id: 701fd08dd1
This commit is contained in:
Nate Jensen 2013-11-05 15:55:57 -06:00 • committed by Gerrit Code Review
commit 10e392a7e3
9 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
edexOsgi/build.edex/esb/bin/daminfotranslator.sh
View file

@ -31,6 +31,6 @@ if [ ${RC} -ne 0 ]; then
echo "Unable To Continue ... Terminating."
fi
JAVA_INSTALL=`rpm -q --queryformat '%{INSTALLPREFIX}' awips2-java`
JAVA_INSTALL=`rpm -q --queryformat '%{INSTPREFIXES}' awips2-java`
${JAVA_INSTALL}/bin/java -classpath $awips_home/edex/lib/plugins/plugin-warning.jar:$awips_home/edex/lib/dependencies/org.geotools/jts-1.9.jar com.raytheon.edex.plugin.warning.tools.DamInfoTranslator $@

4
rpms/awips2.core/Installer.ant/component.spec
View file

@ -4,7 +4,7 @@
Name: awips2-ant
Summary: AWIPS II Ant Distribution
Version: 1.7.1
Release: 2
Release: 3
Group: AWIPSII
BuildRoot: /tmp
BuildArch: noarch
@ -153,4 +153,4 @@ rm -rf ${RPM_BUILD_ROOT}
/awips2/ant/licenses
%doc /awips2/ant/NOTICE
%doc /awips2/ant/README
%doc /awips2/ant/WHATSNEW
%doc /awips2/ant/WHATSNEW

2
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh
View file

@ -1,7 +1,7 @@
#!/bin/csh
# Determine where ant has been installed.
set ANT_INSTALL=`rpm -q --queryformat '%{INSTALLPREFIX}' awips2-ant`
set ANT_INSTALL=`rpm -q --queryformat '%{INSTPREFIXES}' awips2-ant`
setenv ANT_HOME "${ANT_INSTALL}"
if $?PATH then

2
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
View file

@ -8,7 +8,7 @@ if [ ${RC} -ne 0 ]; then
fi
# Determine Where Ant Has Been Installed.
ANT_INSTALL=`rpm -q --queryformat '%{INSTALLPREFIX}' awips2-ant`
ANT_INSTALL=`rpm -q --queryformat '%{INSTPREFIXES}' awips2-ant`
if [ "${ANT_INSTALL}" = "" ]; then
return
fi

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

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

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

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

4
rpms/awips2.core/Installer.tools/component.spec
View file

@ -5,7 +5,7 @@
Name: awips2-tools
Summary: AWIPS II Tools Distribution
Version: 1.0.0
Release: 3
Release: 4
Group: AWIPSII
BuildRoot: /tmp
BuildArch: i386
@ -205,4 +205,4 @@ rm -rf ${RPM_BUILD_ROOT}
%defattr(755,awips,fxalpha,755)
%dir /awips2/tools/bin
/awips2/tools/bin/*
/awips2/tools/bin/*

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

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

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

@ -8,7 +8,7 @@ if [ ${RC} -ne 0 ]; then
fi
# Determine Where awips2-tools Has Been Installed.
HDF5_TOOLS_INSTALL=`rpm -q --queryformat '%{INSTALLPREFIX}' awips2-tools`
HDF5_TOOLS_INSTALL=`rpm -q --queryformat '%{INSTPREFIXES}' awips2-tools`
if [ "${HDF5_TOOLS_INSTALL}" = "" ]; then
return
fi