[patch] init.d-icecream-cleanup+verbosity.patch

init.d-icecream-cleanup+verbosity.patch (text/plain), 2.72 KB, created by Patrick Avery on 2006-07-27 09:24:59 UTC

--- icecream.orig	2006-07-27 09:30:39.000000000 -0500
+++ icecream	2006-07-27 09:30:55.000000000 -0500
@@ -8,43 +8,26 @@
 
 start() {
 
-	netname=
-	if test -n "$ICECREAM_NETNAME"; then
-		netname="-n $ICECREAM_NETNAME"
-	fi
-	if test "$ICECREAM_RUN_SCHEDULER" == "yes"; then
-		logfile=""
-		if test -z "$ICECREAM_SCHEDULER_LOG_FILE"; then
-			ICECREAM_SCHEDULER_LOG_FILE="/var/log/icecc_scheduler"
-		fi
-		logfile="-l $ICECREAM_SCHEDULER_LOG_FILE"
-		: > $ICECREAM_SCHEDULER_LOG_FILE
-		chown icecream:icecream $ICECREAM_SCHEDULER_LOG_FILE
-		
+	local basedir=${ICECREAM_BASEDIR:-"/var/cache/icecream"}
+	local netname=${ICECREAM_NETNAME:+"-n ${ICECREAM_NETNAME}"}
+	local logfile=${ICECREAM_LOG_FILE:+"-l ${ICECREAM_LOG_FILE}"}
+	local nice=${ICECREAM_NICE_LEVEL:+"-n ${ICECREAM_NICE_LEVEL}"}
+	local scheduler=${ICECREAM_SCHEDULER_HOST:+"-s ${ICECREAM_SCHEDULER_HOST}"}
+	local maxjobs=${ICECREAM_MAX_JOBS:+"-m ${ICECREAM_MAX_JOBS}"}
+	local verbosity=${ICECREAM_VERBOSITY:-"-v"}
+	
+	if [[ "${ICECREAM_RUN_SCHEDULER}" == "yes" ]]; then
+		local slogfile=${ICECREAM_SCHEDULER_LOG_FILE:-"/var/log/icecc_scheduler"}
+		touch ${slogfile} && chown icecream:icecream ${slogfile}
+		slogfile=${slogfile:+"-l ${slogfile}"}
 		ebegin "Starting Distributed Compiler Scheduler"
-	        start-stop-daemon -u icecream --start --quiet --exec /usr/sbin/scheduler -- -d $logfile $netname
+		start-stop-daemon -u icecream --start --quiet --exec /usr/sbin/scheduler -- -d ${slogfile} ${netname} ${verbosity}
 		eend ${?}
-        fi
-	logfile=""
-	if test -n "$ICECREAM_LOG_FILE"; then
-		logfile="-l $ICECREAM_LOG_FILE"
-		: > $ICECREAM_LOG_FILE
-		chown icecream:icecream $ICECREAM_LOG_FILE
-	fi
-	nice=
-	if test -n "$ICECREAM_NICE_LEVEL"; then
-		nice="--nice $ICECREAM_NICE_LEVEL"
-	fi
-	scheduler=
-	if test -n "$ICECREAM_SCHEDULER_HOST"; then
-		scheduler="-s $ICECREAM_SCHEDULER_HOST"
-	fi
-	maxjobs=
-	if test -n "$ICECREAM_MAX_JOBS"; then
-		maxjobs="-m $ICECREAM_MAX_JOBS"
 	fi
+
+	[[ ! -d ${basedir} ]] && mkdir -p ${basedir} && chown icecream:icecream ${basedir}
 	ebegin "Starting Distributed Compiler Daemon"
-	start-stop-daemon --start --quiet --exec /usr/sbin/iceccd -- -d $logfile $nice $scheduler $netname -u icecream -b "$ICECREAM_BASEDIR" $maxjobs
+	start-stop-daemon --start --quiet --exec /usr/sbin/iceccd -- -d ${logfile} ${nice} ${scheduler} ${netname} -u icecream -b "${basedir}" ${maxjobs} ${verbosity}
 	eend ${?}
 }
 
@@ -52,7 +35,7 @@
 	ebegin "Stopping Distributed Compiler Daemon"
 	start-stop-daemon --stop --quiet --name iceccd
 	eend ${?}
-	if test "$ICECREAM_RUN_SCHEDULER" == "yes"; then
+	if [[ "${ICECREAM_RUN_SCHEDULER}" == "yes" ]]; then
 		ebegin "Stopping Distributed Compiler Scheduler"
 		start-stop-daemon --stop --quiet --name scheduler
 		eend ${?}