- 1.602: py_lint: fail if no files processed (invalid find pipe)

[packages/rpm-build-macros.git] / service_generator.sh

diff --git a/service_generator.sh b/service_generator.sh
index 83e765395f04304aba4c0bc17145b1aea8c10fd6..2519854ae186b85c368c64613bf6a5ffb92586fa 100644 (file)
--- a/service_generator.sh
+++ b/service_generator.sh
@@ -4,6 +4,7 @@ service="$1"
 action="$2"
 desc="$3"
 quiet=$quiet
+noop=$noop
 if [ -z "$desc" ]; then
        desc="$1 service"
 fi
@@ -18,36 +19,43 @@ fi
 # common part
 service_body() {
        cat <<-EOF
-       if [ -f /var/lock/subsys/$service ]; then
-               /sbin/service $service $action 1>&2 || :;
-EOF
+               if [ -f /var/lock/subsys/$service ]; then
+       EOF
+       if [ "$noop" = 1 ]; then
+               echo :
+       else
+               cat <<-EOF
+                               /sbin/service $service $action 1>&2 || :;
+               EOF
+       fi
+
        if [ "$quiet" != 1 ]; then
                cat <<-EOF
                else
                        echo 'Run "/sbin/service $service start" to start $desc.'
-EOF
+               EOF
        fi
        cat <<-EOF
-       fi
-EOF
+               fi
+       EOF
 }
 
 # include check function
 skip_auto_restart_body() {
        cat <<-EOF
-       skip_auto_restart() {
-               [ -f /etc/sysconfig/rpm ] && . /etc/sysconfig/rpm
-               [ -f /etc/sysconfig/$service ] && . /etc/sysconfig/$service
-               echo \${RPM_SKIP_AUTO_RESTART:-no}
-       };
-EOF
+               skip_auto_restart() {
+                       [ -f /etc/sysconfig/rpm ] && . /etc/sysconfig/rpm
+                       [ -f /etc/sysconfig/$service ] && . /etc/sysconfig/$service
+                       echo \${RPM_SKIP_AUTO_RESTART:-no}
+               };
+       EOF
 }
 
 echo ''
 if [ "$check" = 1 ]; then
        skip_auto_restart_body
        echo 'if [ $(skip_auto_restart) = no ]; then'
-       service_body
+               service_body
        echo 'fi'
 else
        service_body
@@ -68,4 +76,5 @@ rpm -E '%service monit reload "Monit Daemon"' | sh
 rpm -E '%service monit reload -q "Monit Daemon"' | sh
 rpm -E '%{service monit reload "Monit Daemon"} date' | sh
 rpm -E '%{service monit reload "Monit Daemon" -q} date' | sh
+rpm -E '%{service -n monit restart "Monit Daemon" } date' | sh