Issue #202 - remove obsolete edex prefix verifications.
Former-commit-id:c2cd292c32
[formerly 6984db8c852a552867b1b8159637d96dcd83ab5a] Former-commit-id:1e3e31a657
This commit is contained in:
parent
4881def0e9
commit
475849bd91
16 changed files with 15 additions and 207 deletions
|
@ -77,20 +77,6 @@ ${ANT_EXE} -file ${WORKSPACE_DIR}/${DEPLOY_SCRIPT} \
|
|||
-Dcomponent.to.deploy=edex-binlightning
|
||||
|
||||
%pre
|
||||
if [ "${1}" = "1" ]; then
|
||||
# This Is An Installation - Not An Upgrade.
|
||||
# Ensure That We Are Being Installed To The Correct Location.
|
||||
EDEX_INSTALL=`rpm -q --queryformat '%{INSTALLPREFIX}\n' awips2-edex-base`
|
||||
if [ ! "${RPM_INSTALL_PREFIX}" = "${EDEX_INSTALL}" ]; then
|
||||
echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
|
||||
echo -e "\e[1;31m\| ERROR: These Plugins MUST Be Installed At The Same Location As EDEX!!!"
|
||||
echo -e "\e[1;34m\| INFO: Use '--prefix=${EDEX_INSTALL}'.\e[m"
|
||||
echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
|
||||
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "${1}" = "2" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
@ -155,4 +141,4 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||
#---------------------------------------------------------------------------#
|
||||
%dir /awips2
|
||||
%dir /awips2/edex
|
||||
/awips2/edex/*
|
||||
/awips2/edex/*
|
||||
|
|
|
@ -77,20 +77,6 @@ ${ANT_EXE} -file ${WORKSPACE_DIR}/${DEPLOY_SCRIPT} \
|
|||
-Dcomponent.to.deploy=edex-bufr
|
||||
|
||||
%pre
|
||||
if [ "${1}" = "1" ]; then
|
||||
# This Is An Installation - Not An Upgrade.
|
||||
# Ensure That We Are Being Installed To The Correct Location.
|
||||
EDEX_INSTALL=`rpm -q --queryformat '%{INSTALLPREFIX}\n' awips2-edex-base`
|
||||
if [ ! "${RPM_INSTALL_PREFIX}" = "${EDEX_INSTALL}" ]; then
|
||||
echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
|
||||
echo -e "\e[1;31m\| ERROR: These Plugins MUST Be Installed At The Same Location As EDEX!!!"
|
||||
echo -e "\e[1;34m\| INFO: Use '--prefix=${EDEX_INSTALL}'.\e[m"
|
||||
echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
|
||||
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "${1}" = "2" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
@ -155,4 +141,4 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||
#---------------------------------------------------------------------------#
|
||||
%dir /awips2
|
||||
%dir /awips2/edex
|
||||
/awips2/edex/*
|
||||
/awips2/edex/*
|
||||
|
|
|
@ -79,20 +79,6 @@ ${ANT_EXE} -file ${WORKSPACE_DIR}/${DEPLOY_SCRIPT} \
|
|||
|
||||
|
||||
%pre
|
||||
if [ "${1}" = "1" ]; then
|
||||
# This Is An Installation - Not An Upgrade.
|
||||
# Ensure That We Are Being Installed To The Correct Location.
|
||||
EDEX_INSTALL=`rpm -q --queryformat '%{INSTALLPREFIX}\n' awips2-edex-base`
|
||||
if [ ! "${RPM_INSTALL_PREFIX}" = "${EDEX_INSTALL}" ]; then
|
||||
echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
|
||||
echo -e "\e[1;31m\| ERROR: These Plugins MUST Be Installed At The Same Location As EDEX!!!"
|
||||
echo -e "\e[1;34m\| INFO: Use '--prefix=${EDEX_INSTALL}'.\e[m"
|
||||
echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
|
||||
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "${1}" = "2" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
@ -157,4 +143,4 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||
#---------------------------------------------------------------------------#
|
||||
%dir /awips2
|
||||
%dir /awips2/edex
|
||||
/awips2/edex/*
|
||||
/awips2/edex/*
|
||||
|
|
|
@ -75,16 +75,6 @@ if [ "${1}" = "2" ]; then
|
|||
exit 0
|
||||
fi
|
||||
|
||||
EDEX_INSTALL=`rpm -q --queryformat '%{INSTALLPREFIX}\n' awips2-edex-base`
|
||||
if [ ! "${RPM_INSTALL_PREFIX}" = "${EDEX_INSTALL}" ]; then
|
||||
echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
|
||||
echo -e "\e[1;31m\| ERROR: These Files MUST Be Installed At The Same Location As EDEX!!!"
|
||||
echo -e "\e[1;34m\| INFO: Use '--prefix=${EDEX_INSTALL}'.\e[m"
|
||||
echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
|
||||
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo -e "\e[1;34m--------------------------------------------------------------------------------\e[m"
|
||||
echo -e "\e[1;34m\| Installing AWIPS II Edex Configuration...\e[m"
|
||||
echo -e "\e[1;34m--------------------------------------------------------------------------------\e[m"
|
||||
|
@ -241,4 +231,4 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||
%dir /awips2
|
||||
%dir /awips2/edex
|
||||
%dir /awips2/edex/bin
|
||||
%config(noreplace) /awips2/edex/bin/setup.env
|
||||
%config(noreplace) /awips2/edex/bin/setup.env
|
||||
|
|
|
@ -77,20 +77,6 @@ ${ANT_EXE} -file ${WORKSPACE_DIR}/${DEPLOY_SCRIPT} \
|
|||
-Dcomponent.to.deploy=edex-core
|
||||
|
||||
%pre
|
||||
if [ "${1}" = "1" ]; then
|
||||
# This Is An Installation - Not An Upgrade.
|
||||
# Ensure That We Are Being Installed To The Correct Location.
|
||||
EDEX_INSTALL=`rpm -q --queryformat '%{INSTALLPREFIX}\n' awips2-edex-base`
|
||||
if [ ! "${RPM_INSTALL_PREFIX}" = "${EDEX_INSTALL}" ]; then
|
||||
echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
|
||||
echo -e "\e[1;31m\| ERROR: These Plugins MUST Be Installed At The Same Location As EDEX!!!"
|
||||
echo -e "\e[1;34m\| INFO: Use '--prefix=${EDEX_INSTALL}'.\e[m"
|
||||
echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
|
||||
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "${1}" = "2" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
@ -155,4 +141,4 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||
#---------------------------------------------------------------------------#
|
||||
%dir /awips2
|
||||
%dir /awips2/edex
|
||||
/awips2/edex/*
|
||||
/awips2/edex/*
|
||||
|
|
|
@ -80,20 +80,6 @@ ${ANT_EXE} -file ${DEPLOY_SCRIPT} \
|
|||
popd
|
||||
|
||||
%pre
|
||||
if [ "${1}" = "1" ]; then
|
||||
# This Is An Installation - Not An Upgrade.
|
||||
# Ensure That We Are Being Installed To The Correct Location.
|
||||
EDEX_INSTALL=`rpm -q --queryformat '%{INSTALLPREFIX}\n' awips2-edex-base`
|
||||
if [ ! "${RPM_INSTALL_PREFIX}" = "${EDEX_INSTALL}" ]; then
|
||||
echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
|
||||
echo -e "\e[1;31m\| ERROR: These Plugins MUST Be Installed At The Same Location As EDEX!!!"
|
||||
echo -e "\e[1;34m\| INFO: Use '--prefix=${EDEX_INSTALL}'.\e[m"
|
||||
echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
|
||||
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "${1}" = "2" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
|
|
@ -77,20 +77,6 @@ ${ANT_EXE} -file ${WORKSPACE_DIR}/${DEPLOY_SCRIPT} \
|
|||
-Dcomponent.to.deploy=edex-dat
|
||||
|
||||
%pre
|
||||
if [ "${1}" = "1" ]; then
|
||||
# This Is An Installation - Not An Upgrade.
|
||||
# Ensure That We Are Being Installed To The Correct Location.
|
||||
EDEX_INSTALL=`rpm -q --queryformat '%{INSTALLPREFIX}\n' awips2-edex-base`
|
||||
if [ ! "${RPM_INSTALL_PREFIX}" = "${EDEX_INSTALL}" ]; then
|
||||
echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
|
||||
echo -e "\e[1;31m\| ERROR: These Plugins MUST Be Installed At The Same Location As EDEX!!!"
|
||||
echo -e "\e[1;34m\| INFO: Use '--prefix=${EDEX_INSTALL}'.\e[m"
|
||||
echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
|
||||
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "${1}" = "2" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
@ -155,4 +141,4 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||
#---------------------------------------------------------------------------#
|
||||
%dir /awips2
|
||||
%dir /awips2/edex
|
||||
/awips2/edex/*
|
||||
/awips2/edex/*
|
||||
|
|
|
@ -77,20 +77,6 @@ ${ANT_EXE} -file ${WORKSPACE_DIR}/${DEPLOY_SCRIPT} \
|
|||
-Dcomponent.to.deploy=edex-dataplugins
|
||||
|
||||
%pre
|
||||
if [ "${1}" = "1" ]; then
|
||||
# This Is An Installation - Not An Upgrade.
|
||||
# Ensure That We Are Being Installed To The Correct Location.
|
||||
EDEX_INSTALL=`rpm -q --queryformat '%{INSTALLPREFIX}\n' awips2-edex-base`
|
||||
if [ ! "${RPM_INSTALL_PREFIX}" = "${EDEX_INSTALL}" ]; then
|
||||
echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
|
||||
echo -e "\e[1;31m\| ERROR: These Plugins MUST Be Installed At The Same Location As EDEX!!!"
|
||||
echo -e "\e[1;34m\| INFO: Use '--prefix=${EDEX_INSTALL}'.\e[m"
|
||||
echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
|
||||
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "${1}" = "2" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
@ -155,4 +141,4 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||
#---------------------------------------------------------------------------#
|
||||
%dir /awips2
|
||||
%dir /awips2/edex
|
||||
/awips2/edex/*
|
||||
/awips2/edex/*
|
||||
|
|
|
@ -95,20 +95,6 @@ do
|
|||
done
|
||||
|
||||
%pre
|
||||
if [ "${1}" = "1" ]; then
|
||||
# This Is An Installation - Not An Upgrade.
|
||||
# Ensure That We Are Being Installed To The Correct Location.
|
||||
EDEX_INSTALL=`rpm -q --queryformat '%{INSTALLPREFIX}\n' awips2-edex-base`
|
||||
if [ ! "${RPM_INSTALL_PREFIX}" = "${EDEX_INSTALL}" ]; then
|
||||
echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
|
||||
echo -e "\e[1;31m\| ERROR: These Plugins MUST Be Installed At The Same Location As EDEX!!!"
|
||||
echo -e "\e[1;34m\| INFO: Use '--prefix=${EDEX_INSTALL}'.\e[m"
|
||||
echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
|
||||
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "${1}" = "2" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
@ -177,4 +163,4 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||
%dir /awips2/edex/data
|
||||
/awips2/edex/data/*
|
||||
%dir /awips2/edex/lib
|
||||
/awips2/edex/lib/*
|
||||
/awips2/edex/lib/*
|
||||
|
|
|
@ -77,20 +77,6 @@ ${ANT_EXE} -file ${WORKSPACE_DIR}/${DEPLOY_SCRIPT} \
|
|||
-Dcomponent.to.deploy=edex-grib
|
||||
|
||||
%pre
|
||||
if [ "${1}" = "1" ]; then
|
||||
# This Is An Installation - Not An Upgrade.
|
||||
# Ensure That We Are Being Installed To The Correct Location.
|
||||
EDEX_INSTALL=`rpm -q --queryformat '%{INSTALLPREFIX}\n' awips2-edex-base`
|
||||
if [ ! "${RPM_INSTALL_PREFIX}" = "${EDEX_INSTALL}" ]; then
|
||||
echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
|
||||
echo -e "\e[1;31m\| ERROR: These Plugins MUST Be Installed At The Same Location As EDEX!!!"
|
||||
echo -e "\e[1;34m\| INFO: Use '--prefix=${EDEX_INSTALL}'.\e[m"
|
||||
echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
|
||||
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "${1}" = "2" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
@ -155,4 +141,4 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||
#---------------------------------------------------------------------------#
|
||||
%dir /awips2
|
||||
%dir /awips2/edex
|
||||
/awips2/edex/*
|
||||
/awips2/edex/*
|
||||
|
|
|
@ -93,4 +93,4 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||
%defattr(644,awips,fxalpha,755)
|
||||
%dir /awips2
|
||||
%dir /awips2/edex
|
||||
/awips2/edex/*
|
||||
/awips2/edex/*
|
||||
|
|
|
@ -61,20 +61,6 @@ cp -r ${MHS_LIB_DIR}/* \
|
|||
${RPM_BUILD_ROOT}/awips2/edex/lib/native/linux32/awips1
|
||||
|
||||
%pre
|
||||
if [ "${1}" = "1" ]; then
|
||||
# This Is An Installation - Not An Upgrade.
|
||||
# Ensure That We Are Being Installed To The Correct Location.
|
||||
EDEX_INSTALL=`rpm -q --queryformat '%{INSTALLPREFIX}\n' awips2-edex-base`
|
||||
if [ ! "${RPM_INSTALL_PREFIX}" = "${EDEX_INSTALL}" ]; then
|
||||
echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
|
||||
echo -e "\e[1;31m\| ERROR: These Libraries MUST Be Installed At The Same Location As EDEX!!!"
|
||||
echo -e "\e[1;34m\| INFO: Use '--prefix=${EDEX_INSTALL}'.\e[m"
|
||||
echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
|
||||
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "${1}" = "2" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
@ -112,4 +98,4 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||
%dir /awips2/edex/bin
|
||||
/awips2/edex/bin/*
|
||||
%dir /awips2/edex/lib
|
||||
/awips2/edex/lib/*
|
||||
/awips2/edex/lib/*
|
||||
|
|
|
@ -77,20 +77,6 @@ ${ANT_EXE} -file ${WORKSPACE_DIR}/${DEPLOY_SCRIPT} \
|
|||
-Dcomponent.to.deploy=edex-radar
|
||||
|
||||
%pre
|
||||
if [ "${1}" = "1" ]; then
|
||||
# This Is An Installation - Not An Upgrade.
|
||||
# Ensure That We Are Being Installed To The Correct Location.
|
||||
EDEX_INSTALL=`rpm -q --queryformat '%{INSTALLPREFIX}\n' awips2-edex-base`
|
||||
if [ ! "${RPM_INSTALL_PREFIX}" = "${EDEX_INSTALL}" ]; then
|
||||
echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
|
||||
echo -e "\e[1;31m\| ERROR: These Plugins MUST Be Installed At The Same Location As EDEX!!!"
|
||||
echo -e "\e[1;34m\| INFO: Use '--prefix=${EDEX_INSTALL}'.\e[m"
|
||||
echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
|
||||
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "${1}" = "2" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
@ -155,4 +141,4 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||
#---------------------------------------------------------------------------#
|
||||
%dir /awips2
|
||||
%dir /awips2/edex
|
||||
/awips2/edex/*
|
||||
/awips2/edex/*
|
||||
|
|
|
@ -77,20 +77,6 @@ ${ANT_EXE} -file ${WORKSPACE_DIR}/${DEPLOY_SCRIPT} \
|
|||
-Dcomponent.to.deploy=edex-satellite
|
||||
|
||||
%pre
|
||||
if [ "${1}" = "1" ]; then
|
||||
# This Is An Installation - Not An Upgrade.
|
||||
# Ensure That We Are Being Installed To The Correct Location.
|
||||
EDEX_INSTALL=`rpm -q --queryformat '%{INSTALLPREFIX}\n' awips2-edex-base`
|
||||
if [ ! "${RPM_INSTALL_PREFIX}" = "${EDEX_INSTALL}" ]; then
|
||||
echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
|
||||
echo -e "\e[1;31m\| ERROR: These Plugins MUST Be Installed At The Same Location As EDEX!!!"
|
||||
echo -e "\e[1;34m\| INFO: Use '--prefix=${EDEX_INSTALL}'.\e[m"
|
||||
echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
|
||||
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "${1}" = "2" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
@ -155,4 +141,4 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||
#---------------------------------------------------------------------------#
|
||||
%dir /awips2
|
||||
%dir /awips2/edex
|
||||
/awips2/edex/*
|
||||
/awips2/edex/*
|
||||
|
|
|
@ -95,4 +95,4 @@ echo -e "\e[1;34m---------------------------------------------------------------
|
|||
%defattr(775,awips,fxalpha,755)
|
||||
%dir /awips2
|
||||
%dir /awips2/edex
|
||||
/awips2/edex/*
|
||||
/awips2/edex/*
|
||||
|
|
|
@ -77,20 +77,6 @@ ${ANT_EXE} -file ${WORKSPACE_DIR}/${DEPLOY_SCRIPT} \
|
|||
-Dcomponent.to.deploy=edex-text
|
||||
|
||||
%pre
|
||||
if [ "${1}" = "1" ]; then
|
||||
# This Is An Installation - Not An Upgrade.
|
||||
# Ensure That We Are Being Installed To The Correct Location.
|
||||
EDEX_INSTALL=`rpm -q --queryformat '%{INSTALLPREFIX}\n' awips2-edex-base`
|
||||
if [ ! "${RPM_INSTALL_PREFIX}" = "${EDEX_INSTALL}" ]; then
|
||||
echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
|
||||
echo -e "\e[1;31m\| ERROR: These Plugins MUST Be Installed At The Same Location As EDEX!!!"
|
||||
echo -e "\e[1;34m\| INFO: Use '--prefix=${EDEX_INSTALL}'.\e[m"
|
||||
echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
|
||||
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "${1}" = "2" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
@ -155,4 +141,4 @@ rm -rf ${RPM_BUILD_ROOT}
|
|||
#---------------------------------------------------------------------------#
|
||||
%dir /awips2
|
||||
%dir /awips2/edex
|
||||
/awips2/edex/*
|
||||
/awips2/edex/*
|
||||
|
|
Loading…
Add table
Reference in a new issue