Author: tmckay Date: 2011-06-14 19:08:07 +0000 (Tue, 14 Jun 2011) New Revision: 4824
Modified: branches/clarity/cumin/etc/sysvinit-cumin Log: Merge 4776 from trunk. BZ673273
Modified: branches/clarity/cumin/etc/sysvinit-cumin =================================================================== --- branches/clarity/cumin/etc/sysvinit-cumin 2011-06-14 19:05:44 UTC (rev 4823) +++ branches/clarity/cumin/etc/sysvinit-cumin 2011-06-14 19:08:07 UTC (rev 4824) @@ -8,28 +8,19 @@ #
# Sanity checks. -test -x /usr/bin/cumin || exit 1 -test -x /usr/bin/cumin-database || exit 1 - -SYSCONFIG="/etc/sysconfig/cumin" -[ -r "$SYSCONFIG" ] && source "$SYSCONFIG" - -cumin-database check-started &> /dev/null || { - echo "Cumin's database server is not running" - echo "Run 'cumin-database start' as root" +test -x /usr/bin/cumin || { + echo "/usr/bin/cumin has been removed" exit 1 }
-cumin-database check &> /dev/null || { - # Run again with output left on for user. - echo "Cumin's database is not yet installed" - echo "Run 'cumin-database install' as root" - - echo "(detailed output from cumin-database check:)" - cumin-database check noadvice +test -x /usr/bin/cumin-database || { + echo "/usr/bin/cumin-database has been removed" exit 1 }
+SYSCONFIG="/etc/sysconfig/cumin" +[ -r "$SYSCONFIG" ] && source "$SYSCONFIG" + # Source function library. . /etc/rc.d/init.d/functions
@@ -40,6 +31,24 @@ RETVAL=0
start() { + + # Initial checks for the start case + cumin-database check-started &> /dev/null || { + echo "Cumin's database server is not running" + echo "Run 'cumin-database start' as root" + exit 1 + } + + cumin-database check &> /dev/null || { + # Run again with output left on for user. + echo "Cumin's database is not yet installed" + echo "Run 'cumin-database install' as root" + + echo "(detailed output from cumin-database check:)" + cumin-database check noadvice + exit 1 + } + echo -n $"Starting cumin: " # If it's already running, be happy and return success status $processname &> /dev/null
cumin-developers@lists.fedorahosted.org