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

Merge "Issue #1373 - prevent file naming conflicts" into development

Browse source 
Former-commit-id: 274aecc49b [formerly e6b9d5efa0] [formerly 274aecc49b [formerly e6b9d5efa0] [formerly 3128e0ae68 [formerly abc2790a82b6b6a80e7e958cd8c96dceaf78b860]]]
Former-commit-id: 3128e0ae68
Former-commit-id: 5efecb2e6b [formerly fc9ce23c7c]
Former-commit-id: 838c77bca1
This commit is contained in:
Bryan Kowal 2013-01-05 10:41:54 -06:00 • committed by Gerrit Code Review
commit 9d9f8bc837
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
rpms/awips2.edex/Installer.edex-datadelivery/datadelivery.patch0
View file

@ -1,6 +1,6 @@
diff -crB a/component.spec b/component.spec diff -crB a/component.spec b/component.spec
*** a/component.spec 2013-01-04 11:35:41.000000000 -0600 *** a/component.spec 2013-01-05 09:43:38.000000000 -0600
--- b/component.spec 2013-01-04 11:35:57.000000000 -0600 --- b/component.spec 2013-01-05 09:49:43.000000000 -0600
*************** ***************
*** 1,13 **** *** 1,13 ****
# #
@ -48,7 +48,7 @@ diff -crB a/component.spec b/component.spec
requires: awips2-edex-base requires: awips2-edex-base
requires: awips2-python requires: awips2-python
*************** ***************
*** 40,57 **** *** 40,58 ****
rm -rf %{_build_root} rm -rf %{_build_root}
fi fi
mkdir -p %{_build_root} mkdir -p %{_build_root}
@ -67,7 +67,8 @@ diff -crB a/component.spec b/component.spec
%post %post
%preun %preun
%postun %postun
--- 40,80 ----
--- 40,88 ----
rm -rf %{_build_root} rm -rf %{_build_root}
fi fi
mkdir -p %{_build_root} mkdir -p %{_build_root}
@ -94,21 +95,29 @@ diff -crB a/component.spec b/component.spec
+ if [ $? -ne 0 ]; then + if [ $? -ne 0 ]; then
+ exit 1 + exit 1
+ fi + fi
+ # rename the script to prevent naming conflicts during installation
+ pushd . > /dev/null 2>&1
+ cd %{_build_root}/etc/init.d
+ mv edexServiceList edexServiceList-datadelivery
+ popd > /dev/null 2>&1
+ +
%pre %pre
+ # since, we will be overriding the services that are started %post
+ # we will begin by removing any existing edexServiceList scripts + # replace the service list script with the datadelivery service list script
+ if [ -f /etc/init.d/edexServiceList ]; then + if [ -f /etc/init.d/edexServiceList ]; then
+ rm -f /etc/init.d/edexServiceList + rm -f /etc/init.d/edexServiceList
+ if [ $? -ne 0 ]; then + if [ $? -ne 0 ]; then
+ # fail the install
+ exit 1 + exit 1
+ fi + fi
+ fi + fi
+ mv /etc/init.d/edexServiceList-datadelivery /etc/init.d/edexServiceList
+ if [ $? -ne 0 ]; then
+ exit 1
+ fi
+ +
%post
%preun %preun
%postun %postun
*************** ***************
*** 63,66 **** *** 63,66 ****
%defattr(644,awips,fxalpha,755) %defattr(644,awips,fxalpha,755)
@ -116,11 +125,10 @@ diff -crB a/component.spec b/component.spec
%dir /awips2/edex %dir /awips2/edex
! /awips2/edex/* ! /awips2/edex/*
\ No newline at end of file \ No newline at end of file
--- 86,91 ---- --- 93,98 ----
%defattr(644,awips,fxalpha,755) %defattr(644,awips,fxalpha,755)
%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