SVN: toys/stbr/cvslog.sh

[shadzik]

Author: shadzik
Date: Fri Jun 20 20:20:07 2008
New Revision: 9818

Modified:
   toys/stbr/cvslog.sh
Log:
- fix argument


Modified: toys/stbr/cvslog.sh
==============================================================================
--- toys/stbr/cvslog.sh	(original)
+++ toys/stbr/cvslog.sh	Fri Jun 20 20:20:07 2008
@@ -9,25 +9,25 @@
 BUILDER="$2"
 BRANCH="$4"
 SEND_TO="$5"
+SPEC="$3"
 
 option="-r"
 send_branch=":$BRANCH"
 
-if [ "$BUILDER" == "test-build" ]; then
-	option="-t"
-fi
+if [ "$BUILDER" == "upgrade" ]; then
 
-rm -f SPECS/$3 >/dev/null 2>&1
+rm -f SPECS/$SPEC >/dev/null 2>&1
 
 if [ "$BRANCH" == "HEAD" ]; then
 	send_branch=""
-	cvs -d $CVSROOT get SPECS/$3 >/dev/null 2>&1
+	cvs -d $CVSROOT get SPECS/$SPEC >/dev/null 2>&1
 else
-	cvs -d $CVSROOT up -r $BRANCH SPECS/$3 >/dev/null 2>&1
+	cvs -d $CVSROOT up -r $BRANCH SPECS/$SPEC >/dev/null 2>&1
+fi
+ADD_INFO=`grep -B 50 -A 2 Name: SPECS/$SPEC`
 fi
 
-ADD_INFO=`grep -B 50 -A 2 Name: SPECS/$3`
-
+function sendreq() {
 /usr/sbin/sendmail -t <<EOF
 From: $FROM <$FROM at IRC-bot>
 To: $SEND_TO@$HOST
@@ -35,11 +35,11 @@
 
 Hello,
 
-$FROM is requesting build for $3 (on branch $BRANCH).
+$FROM is requesting build for $SPEC (on branch $BRANCH).
 Please perform an $BUILDER.
 
 I suppose you're lazy so I provide some commands you could just copy & paste:
-./make-request.sh -d th $option $3$send_branch
+./make-request.sh -d th $option $SPEC$send_branch
 
 Additional spec information:
 $ADD_INFO
@@ -49,3 +49,31 @@
 Yours truly,
 STBR Requester
 EOF
+}
+
+function sendcmd() {
+/usr/sbin/sendmail -t <<EOF
+From: $FROM <$FROM at IRC-bot>
+To: $SEND_TO@$HOST
+Subject: COMMAND request
+
+Hello,
+
+$FROM is requesting command on builders.
+
+I suppose you're lazy so I provide some commands you could just copy & paste:
+./make-request.sh -d th -c $SPEC
+
+Thank you.
+
+Yours truly,
+STBR Requester
+EOF
+}
+
+if [ "$BUILDER" == "command" ]; then
+	sendcmd
+else
+	sendreq
+fi
+