From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 14 Nov 2011 15:51:50 +0000 (+0000)
Subject: Improve SLC RPM
X-Git-Tag: argeo-slc-2.1.7~846
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=c61993e209164d24156b72cc5f8433267ff6397b;p=gpl%2Fargeo-slc.git

Improve SLC RPM

git-svn-id: https://svn.argeo.org/slc/trunk@4907 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/dist/slc/src/main/rpm/etc/init.d/slc b/dist/slc/src/main/rpm/etc/init.d/slc
index 13c272c30..ef7534ec5 100644
--- a/dist/slc/src/main/rpm/etc/init.d/slc
+++ b/dist/slc/src/main/rpm/etc/init.d/slc
@@ -1,42 +1,31 @@
 #!/bin/bash
 #
-# slc-server	SLC Server
+# slc	Argeo SLC
 #
 # chkconfig: 3 92 92
-# description: SLC Server
+# description: Argeo SLC (http://www.argeo.org)
 
 # Source function library.
-. /etc/rc.d/init.d/functions
+. /etc/osgiboot/osgi-service-init-functions.sh
 
-RETVAL=0
+# Application id (must be in line with header)
+APP=slc
 
-start() {
-	/usr/sbin/osgi-service slc start
-	action $"Start SLC" /bin/true
-	return $RETVAL
-}
-
-stop() {
-	/usr/sbin/osgi-service slc stop
-	action $"Stop SLC" /bin/true
-	return $RETVAL
-}
-
-# See how we were called.
+# main
 case "$1" in
   start)
-        start
+        osgi_service_start $APP
         ;;
   stop)
-        stop
+        osgi_service_stop $APP
         ;;
   restart)
-        stop
-        start
+        osgi_service_stop $APP
+        osgi_service_start $APP
         RETVAL=$?
         ;;
   status)
-  		/usr/sbin/osgi-service slc-server status
+        osgi_service_status $APP
         ;;
   *)
         echo $"Usage: $0 {start|stop|restart|status}"