[sblim-cmpi-syslog/f19] Update scriptlets to register with both sfcbd and pegasus

[Tomas Bzatek]

commit 952ce800809e55a8e97bd9ad3c962da3a849f639
Author: Tomas Bzatek <tbzatek at redhat.com>
Date:   Mon Jun 3 11:56:29 2013 +0200

    Update scriptlets to register with both sfcbd and pegasus

 sblim-cmpi-syslog.spec |   92 +++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 80 insertions(+), 12 deletions(-)
---
diff --git a/sblim-cmpi-syslog.spec b/sblim-cmpi-syslog.spec
index b3db3ba..ef86e6e 100644
--- a/sblim-cmpi-syslog.spec
+++ b/sblim-cmpi-syslog.spec
@@ -3,7 +3,7 @@
 Summary:        SBLIM syslog instrumentation
 Name:           sblim-cmpi-syslog
 Version:        0.8.0
-Release:        8.20120315cvs%{?dist}
+Release:        9.20120315cvs%{?dist}
 License:        EPL
 Group:          Applications/System
 URL:            http://sourceforge.net/projects/sblim/
@@ -107,30 +107,98 @@ $RPM_BUILD_ROOT/%{_datadir}/sblim-testsuite/system/linux/messagelog.sh
 %global SYSLOG_REGISTRATION %{_datadir}/sblim-cmpi-syslog/Syslog_Configuration.registration  %{_datadir}/sblim-cmpi-syslog/Syslog_Log.registration %{_datadir}/sblim-cmpi-syslog/Syslog_Service.registration
 
 %pre
-# If upgrading, deregister old version
-if [ $1 -gt 1 ]; then
+function unregister()
+{
   %{_datadir}/%{name}/provider-register.sh -d \
-  -r %{SYSLOG_REGISTRATION} -m %{SYSLOG_SCHEMA} > /dev/null 2>&1 || :;
+        $1 \
+        -m %{SYSLOG_SCHEMA} \
+        -r %{SYSLOG_REGISTRATION} > /dev/null 2>&1 || :;
+  # don't let registration failure when server not running fail upgrade!
+}
+
+# If upgrading, deregister old version
+if [ $1 -gt 1 ]
+then
+        unregistered=no
+        if [ -e /usr/sbin/cimserver ]; then
+           unregister "-t pegasus";
+           unregistered=yes
+        fi
+
+        if [ -e /usr/sbin/sfcbd ]; then
+           unregister "-t sfcb";
+           unregistered=yes
+        fi
+
+        if [ "$unregistered" != yes ]; then
+           unregister
+        fi
 fi
 
 %post
-/sbin/ldconfig
-if [ $1 -ge 1 ]; then
-# Register Schema and Provider - this is higly provider specific
+function register()
+{
+  # The follwoing script will handle the registration for various CIMOMs.
   %{_datadir}/%{name}/provider-register.sh \
-  -r %{SYSLOG_REGISTRATION} -m %{SYSLOG_SCHEMA} > /dev/null 2>&1 || :;
-fi;
+        $1 \
+        -m %{SYSLOG_SCHEMA} \
+        -r %{SYSLOG_REGISTRATION} > /dev/null 2>&1 || :;
+  # don't let registration failure when server not running fail install!
+}
+
+/sbin/ldconfig
+if [ $1 -ge 1 ]
+then
+        registered=no
+        if [ -e /usr/sbin/cimserver ]; then
+          register "-t pegasus";
+          registered=yes
+        fi
+
+        if [ -e /usr/sbin/sfcbd ]; then
+          register "-t sfcb";
+          registered=yes
+        fi
+
+        if [ "$registered" != yes ]; then
+          register
+        fi
+fi
 
 %preun
-# Deregister only if not upgrading
-if [ $1 -eq 0 ]; then
+function unregister()
+{
   %{_datadir}/%{name}/provider-register.sh -d \
-  -r %{SYSLOG_REGISTRATION} -m %{SYSLOG_SCHEMA} > /dev/null 2>&1 || :;
+        $1 \
+        -m %{SYSLOG_SCHEMA} \
+        -r %{SYSLOG_REGISTRATION} > /dev/null 2>&1 || :;
+  # don't let registration failure when server not running fail erase!
+}
+
+if [ $1 -eq 0 ]
+then
+        unregistered=no
+        if [ -e /usr/sbin/cimserver ]; then
+          unregister "-t pegasus";
+          unregistered=yes
+        fi
+
+        if [ -e /usr/sbin/sfcbd ]; then
+          unregister "-t sfcb";
+          unregistered=yes
+        fi
+
+        if [ "$unregistered" != yes ]; then
+          unregister
+        fi
 fi
 
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu May 30 2013 Tomas Bzatek <tbzatek at redhat.com> - 0.8.0-9.20120315cvs
+- Update scriptlets to register with both sfcbd and pegasus
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.0-8.20120315cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild