SVN: toys/stbr/stbr.tcl

[shadzik]

Author: shadzik
Date: Thu May 17 00:11:55 2007
New Revision: 8570

Modified:
   toys/stbr/stbr.tcl
Log:
- changed usage a bit (old one still works, will be removed by next version)
- apopraite message change


Modified: toys/stbr/stbr.tcl
==============================================================================
--- toys/stbr/stbr.tcl	(original)
+++ toys/stbr/stbr.tcl	Thu May 17 00:11:55 2007
@@ -1,13 +1,13 @@
 # Send To Builder Request TCL by shadzik at pld-linux.org
 
 set reqbook "./scripts/requesters.txt"
-set logfile "./scripts/stbrlog.db"
+set logfile "/home/users/stbr/db/stbrlog.db"
 set file "./scripts/cvslog.sh"
 set back &
 set cntr 0
 set towho "./scripts/sent.txt"
 set cvsroot ":pserver:cvs at cvs.pld-linux.org:/cvsroot"
-set usage "Usage: !stbr \[help\] th-{ready|test} spec1\[:BRANCH\] spec2\[:BRANCH\] ..."
+set usage "Usage: !stbr \[help\] \[no\]upgrade spec1\[:BRANCH\] spec2\[:BRANCH\] ..."
 
 proc cvs {spec branch} {
 	global cvsroot
@@ -18,7 +18,7 @@
 }
 
 proc help {chan nick} {
-	putserv "privmsg $chan :$nick: Most importand is that you understand what the difference between th-test and th-ready is. When you call a th-test build it's going to be just an test-build. When you call a th-ready build the package is going to be upgraded on builders and ftp."
+	putserv "privmsg $chan :$nick: Most importand is that you understand what the difference between 'upgrade' and 'noupgrade' is. When you call 'noupgrade' it's going to be just an test-build. When you call 'upgrade' the package is going to be upgraded on builders and ftp."
 }
 
 bind pub * !stbr pub:stbr
@@ -33,9 +33,11 @@
 set second [lindex $arg 1]
 set specs ""; append specs $second; append specs " "; append specs [lrange $arg 2 end]
 set rspecs ""
-if {!([string match th-ready $first] || [string match th-test $first])} {putserv "privmsg $chan :$nick: $usage"; return 0}
+if {!([string match th-ready $first] || [string match th-test $first] || [string match noupgrade $first] || [string match upgrade $first])} {putserv "privmsg $chan :$nick: $usage"; return 0}
 if {([string length $second]<2)} {putserv "privmsg $chan :$nick: $usage"; return 0}
 if {$cntr<1} {incr cntr} {utimer 30 "set cntr 0"; putserv "privmsg $chan :$nick: I reached my STBR time limit (30sec). Please try later."; return 0}
+if {([string match th-test $first] || [string match noupgrade $first])} {set first "test-build"}
+if {([string match th-ready $first])} {set first "upgrade"}
 set time [clock seconds]
 set date [clock format $time -format "%d.%m.%Y %H:%M:%S"]
 exec sqlite $logfile "INSERT INTO stbr VALUES('$date','$nick');"
@@ -50,7 +52,7 @@
 close $tfile
 exec sqlite $logfile "INSERT INTO application VALUES('$date','$spec','$person','$first');"
 }
-putserv "privmsg $chan :$nick: Sent STBR Mail to $first for $rspecs."
+putserv "privmsg $chan :$nick: Sent STBR Mail, an $first will be performed for $rspecs."
 if {$cntr<1} {incr cntr} {utimer 30 "set cntr 0"; return 1}
 }