Omaha #4065 - Update EDEX RPM install to modify date stamp
Change-Id: I425408d1d038194207469f187be74f8c88f5d3c0 Former-commit-id:8c38289cf7
[formerly8c38289cf7
[formerly 83243af002e8ddfd15f899ff1ab3e511cf5a0af4]] Former-commit-id:fbadd1deb1
Former-commit-id:a3d4342498
This commit is contained in:
parent
fa9890db7a
commit
fdf1408c06
5 changed files with 134 additions and 34 deletions
|
@ -81,6 +81,14 @@ if [ $? -ne 0 ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
#create a list of all files packaged for /awips2/edex/data/utility
|
||||||
|
UTILITY=/awips2/edex/data/utility
|
||||||
|
if [ -d %{_build_root}/$UTILITY ]; then
|
||||||
|
cd %{_build_root}/$UTILITY
|
||||||
|
find . -type f > %{_build_root}/awips2/edex/util_filelist.%{name}.txt
|
||||||
|
fi
|
||||||
|
|
||||||
%pre
|
%pre
|
||||||
%post
|
%post
|
||||||
# EDEX installed?
|
# EDEX installed?
|
||||||
|
@ -88,13 +96,26 @@ fi
|
||||||
# when the plugins are for EDEX, we just leave
|
# when the plugins are for EDEX, we just leave
|
||||||
# them on the filesystem; no action required.
|
# them on the filesystem; no action required.
|
||||||
rpm -q awips2-edex > /dev/null 2>&1
|
rpm -q awips2-edex > /dev/null 2>&1
|
||||||
if [ $? -ne 0 ]; then
|
retVal=$?
|
||||||
|
if [ $retVal -ne 0 ]; then
|
||||||
# hide the edex plugins
|
# hide the edex plugins
|
||||||
pushd . > /dev/null 2>&1
|
pushd . > /dev/null 2>&1
|
||||||
cd /awips2
|
cd /awips2
|
||||||
rm -rf .edex
|
rm -rf .edex
|
||||||
mv edex .edex
|
mv edex .edex
|
||||||
popd > /dev/null 2>&1
|
popd > /dev/null 2>&1
|
||||||
|
else if [ $retVal -eq 0 ]; then
|
||||||
|
#change date stamp of utility files
|
||||||
|
UTILITY=/awips2/edex/data/utility
|
||||||
|
UTIL_FILENAME=/awips2/edex/util_filelist.%{name}.txt
|
||||||
|
if [ -d $UTILITY ] && [ -f $UTIL_FILENAME ]; then
|
||||||
|
while read fileName
|
||||||
|
do
|
||||||
|
touch "$UTILITY/$fileName"
|
||||||
|
done < $UTIL_FILENAME
|
||||||
|
rm -f $UTIL_FILENAME
|
||||||
|
fi
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# CAVE installed?
|
# CAVE installed?
|
||||||
|
@ -114,6 +135,8 @@ else
|
||||||
popd > /dev/null 2>&1
|
popd > /dev/null 2>&1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
if [ -d /awips2/.cave ]; then
|
if [ -d /awips2/.cave ]; then
|
||||||
rm -rf /awips2/.cave
|
rm -rf /awips2/.cave
|
||||||
|
|
|
@ -50,12 +50,33 @@ fi
|
||||||
|
|
||||||
unzip %{_baseline_workspace}/build.edex/edex/dist/%{_component_name}.zip \
|
unzip %{_baseline_workspace}/build.edex/edex/dist/%{_component_name}.zip \
|
||||||
-d %{_build_root}
|
-d %{_build_root}
|
||||||
|
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
#create a list of all files packaged for /awips2/edex/data/utility
|
||||||
|
UTILITY=/awips2/edex/data/utility
|
||||||
|
if [ -d %{_build_root}/$UTILITY ]; then
|
||||||
|
cd %{_build_root}/$UTILITY
|
||||||
|
find . -type f > %{_build_root}/awips2/edex/util_filelist.%{name}.txt
|
||||||
|
fi
|
||||||
|
|
||||||
%pre
|
%pre
|
||||||
%post
|
%post
|
||||||
|
|
||||||
|
|
||||||
|
#change date stamp of utility files
|
||||||
|
UTILITY=/awips2/edex/data/utility
|
||||||
|
UTIL_FILENAME=/awips2/edex/util_filelist.%{name}.txt
|
||||||
|
if [ -d $UTILITY ] && [ -f $UTIL_FILENAME ]; then
|
||||||
|
while read fileName
|
||||||
|
do
|
||||||
|
touch "$UTILITY/$fileName"
|
||||||
|
done < $UTIL_FILENAME
|
||||||
|
rm -f $UTIL_FILENAME
|
||||||
|
fi
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
%postun
|
%postun
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
diff -crB a/component.spec b/component.spec
|
*** Installer.edex-component/component.spec 2015-02-02 15:31:30.696998251 -0600
|
||||||
*** a/component.spec 2013-09-03 10:51:59.952913214 -0500
|
--- Installer.edex-datadelivery/component.spec 2015-02-02 15:35:06.923609297 -0600
|
||||||
--- b/component.spec 2013-09-03 11:10:40.703226553 -0500
|
|
||||||
***************
|
***************
|
||||||
*** 6,13 ****
|
*** 6,13 ****
|
||||||
%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
|
%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
|
||||||
|
@ -38,24 +37,21 @@ diff -crB a/component.spec b/component.spec
|
||||||
requires: awips2-edex-base
|
requires: awips2-edex-base
|
||||||
requires: awips2-python
|
requires: awips2-python
|
||||||
***************
|
***************
|
||||||
*** 47,62 ****
|
*** 47,59 ****
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
! unzip %{_baseline_workspace}/build.edex/edex/dist/%{_component_name}.zip \
|
! unzip %{_baseline_workspace}/build.edex/edex/dist/%{_component_name}.zip \
|
||||||
-d %{_build_root}
|
-d %{_build_root}
|
||||||
|
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
%pre
|
#create a list of all files packaged for /awips2/edex/data/utility
|
||||||
%post
|
UTILITY=/awips2/edex/data/utility
|
||||||
%preun
|
--- 47,77 ----
|
||||||
%postun
|
|
||||||
|
|
||||||
%clean
|
|
||||||
--- 47,104 ----
|
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
@ -67,38 +63,58 @@ diff -crB a/component.spec b/component.spec
|
||||||
|
|
||||||
! unzip %{_baseline_workspace}/build.edex/edex/dist/edex-datadelivery.zip \
|
! unzip %{_baseline_workspace}/build.edex/edex/dist/edex-datadelivery.zip \
|
||||||
-d %{_build_root}
|
-d %{_build_root}
|
||||||
if [ $? -ne 0 ]; then
|
+ if [ $? -ne 0 ]; then
|
||||||
exit 1
|
+ exit 1
|
||||||
fi
|
+ fi
|
||||||
|
|
||||||
+ # include the init.d script
|
+ # include the init.d script
|
||||||
+ INSTALLER_RPM="%{_baseline_workspace}/rpms"
|
+ INSTALLER_RPM="%{_baseline_workspace}/rpms"
|
||||||
+ EDEX_DATADELIVERY="${INSTALLER_RPM}/awips2.edex/Installer.edex-datadelivery"
|
+ EDEX_DATADELIVERY="${INSTALLER_RPM}/awips2.edex/Installer.edex-datadelivery"
|
||||||
+ cp -v ${EDEX_DATADELIVERY}/scripts/init.d/* \
|
+ cp -v ${EDEX_DATADELIVERY}/scripts/init.d/* \
|
||||||
+ %{_build_root}/etc/init.d
|
+ %{_build_root}/etc/init.d
|
||||||
+ if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
+ exit 1
|
exit 1
|
||||||
+ fi
|
fi
|
||||||
+ # rename the script to prevent naming conflicts during installation
|
+ # rename the script to prevent naming conflicts during installation
|
||||||
+ pushd . > /dev/null 2>&1
|
+ pushd . > /dev/null 2>&1
|
||||||
+ cd %{_build_root}/etc/init.d
|
+ cd %{_build_root}/etc/init.d
|
||||||
+ mv edexServiceList edexServiceList-datadelivery
|
+ mv edexServiceList edexServiceList-datadelivery
|
||||||
+ popd > /dev/null 2>&1
|
+ popd > /dev/null 2>&1
|
||||||
+
|
|
||||||
|
#create a list of all files packaged for /awips2/edex/data/utility
|
||||||
|
UTILITY=/awips2/edex/data/utility
|
||||||
|
***************
|
||||||
|
*** 64,70 ****
|
||||||
|
|
||||||
%pre
|
%pre
|
||||||
%post
|
%post
|
||||||
+ # replace the service list script with the datadelivery service list script
|
!
|
||||||
+ if [ -f /etc/init.d/edexServiceList ]; then
|
|
||||||
+ mv /etc/init.d/edexServiceList /etc/init.d/edexServiceList.orig
|
#change date stamp of utility files
|
||||||
+ if [ $? -ne 0 ]; then
|
UTILITY=/awips2/edex/data/utility
|
||||||
+ exit 1
|
--- 82,98 ----
|
||||||
+ fi
|
|
||||||
+ fi
|
%pre
|
||||||
+ mv /etc/init.d/edexServiceList-datadelivery /etc/init.d/edexServiceList
|
%post
|
||||||
+ if [ $? -ne 0 ]; then
|
! # replace the service list script with the datadelivery service list script
|
||||||
+ exit 1
|
! if [ -f /etc/init.d/edexServiceList ]; then
|
||||||
+ fi
|
! mv /etc/init.d/edexServiceList /etc/init.d/edexServiceList.orig
|
||||||
+
|
! if [ $? -ne 0 ]; then
|
||||||
|
! exit 1
|
||||||
|
! fi
|
||||||
|
! fi
|
||||||
|
! mv /etc/init.d/edexServiceList-datadelivery /etc/init.d/edexServiceList
|
||||||
|
! if [ $? -ne 0 ]; then
|
||||||
|
! exit 1
|
||||||
|
! fi
|
||||||
|
|
||||||
|
#change date stamp of utility files
|
||||||
|
UTILITY=/awips2/edex/data/utility
|
||||||
|
***************
|
||||||
|
*** 78,83 ****
|
||||||
|
--- 106,122 ----
|
||||||
|
fi
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
+ if [ "${1}" = "1" ]; then
|
+ if [ "${1}" = "1" ]; then
|
||||||
+ exit 0
|
+ exit 0
|
||||||
|
@ -115,11 +131,10 @@ diff -crB a/component.spec b/component.spec
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
***************
|
***************
|
||||||
*** 67,69 ****
|
*** 88,90 ****
|
||||||
--- 109,113 ----
|
--- 127,131 ----
|
||||||
%dir /awips2
|
%dir /awips2
|
||||||
%dir /awips2/edex
|
%dir /awips2/edex
|
||||||
/awips2/edex/*
|
/awips2/edex/*
|
||||||
+
|
+
|
||||||
+ %attr(744,root,root) /etc/init.d/*
|
+ %attr(744,root,root) /etc/init.d/*
|
||||||
\ No newline at end of file
|
|
||||||
|
|
|
@ -76,10 +76,30 @@ if [ $? -ne 0 ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
#create a list of all files packaged for /awips2/edex/data/utility
|
||||||
|
UTILITY=/awips2/edex/data/utility
|
||||||
|
if [ -d %{_build_root}/$UTILITY ]; then
|
||||||
|
cd %{_build_root}/$UTILITY
|
||||||
|
find . -type f > %{_build_root}/awips2/edex/util_filelist.%{name}.txt
|
||||||
|
fi
|
||||||
|
|
||||||
%pre
|
%pre
|
||||||
|
|
||||||
%post
|
%post
|
||||||
|
|
||||||
|
|
||||||
|
#change date stamp of utility files
|
||||||
|
UTILITY=/awips2/edex/data/utility
|
||||||
|
UTIL_FILENAME=/awips2/edex/util_filelist.%{name}.txt
|
||||||
|
if [ -d $UTILITY ] && [ -f $UTIL_FILENAME ]; then
|
||||||
|
while read fileName
|
||||||
|
do
|
||||||
|
touch "$UTILITY/$fileName"
|
||||||
|
done < $UTIL_FILENAME
|
||||||
|
rm -f $UTIL_FILENAME
|
||||||
|
fi
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
|
|
|
@ -108,6 +108,15 @@ if [ $? -ne 0 ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
#create a list of all files packaged for /awips2/edex/data/utility
|
||||||
|
UTILITY=/awips2/edex/data/utility
|
||||||
|
if [ -d %{_build_root}/$UTILITY ]; then
|
||||||
|
cd %{_build_root}/$UTILITY
|
||||||
|
find . -type f > %{_build_root}/awips2/edex/etc/util_filelist.%{name}.txt
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
%pre
|
%pre
|
||||||
|
|
||||||
%post
|
%post
|
||||||
|
@ -146,6 +155,18 @@ if [ -d /awips2/.edex ]; then
|
||||||
rm -rf /awips2/.edex
|
rm -rf /awips2/.edex
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
#change date stamp of utility files
|
||||||
|
UTILITY=/awips2/edex/data/utility
|
||||||
|
UTIL_FILENAME=/awips2/edex/etc/util_filelist.%{name}.txt
|
||||||
|
if [ -d $UTILITY ] && [ -f $UTIL_FILENAME ]; then
|
||||||
|
while read fileName
|
||||||
|
do
|
||||||
|
touch "$UTILITY/$fileName"
|
||||||
|
done < $UTIL_FILENAME
|
||||||
|
rm -f $UTIL_FILENAME
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
if [ "${1}" = "1" ]; then
|
if [ "${1}" = "1" ]; then
|
||||||
exit 0
|
exit 0
|
||||||
|
|
Loading…
Add table
Reference in a new issue