diff options
| -rwxr-xr-x | bin/email2irc.sh | 3 | ||||
| -rw-r--r-- | etc/colorit.conf | 29 | ||||
| -rwxr-xr-x | update_jdn.sh | 2 |
3 files changed, 3 insertions, 31 deletions
diff --git a/bin/email2irc.sh b/bin/email2irc.sh index f800921b..706b695e 100755 --- a/bin/email2irc.sh +++ b/bin/email2irc.sh @@ -48,7 +48,8 @@ if [ "$VALID_MAIL" == "true" ] ; then echo $FIRST_LINE >> $LOGFILE if [ ! -z $CHANNEL ] ; then echo "#$CHANNEL: $SUBJECT. $FIRST_LINE" >> $LOGFILE - MESSAGE=$(echo "$SUBJECT. $FIRST_LINE" | colorit -c /etc/colorit.conf ) + #MESSAGE=$(echo "$SUBJECT. $FIRST_LINE" | colorit -c /etc/colorit.conf ) + MESSAGE="$SUBJECT. $FIRST_LINE" kgb-client --conf /srv/jenkins/kgb/$CHANNEL.conf --relay-msg "$MESSAGE" && echo "kgb informed successfully." >> $LOGFILE echo >> $LOGFILE else diff --git a/etc/colorit.conf b/etc/colorit.conf deleted file mode 100644 index 09abecf0..00000000 --- a/etc/colorit.conf +++ /dev/null @@ -1,29 +0,0 @@ -dnl /srv/jenkins/colorit.conf vim:ft=m4 -dnl -dnl Sample configuration file for colorit(1) program -dnl -divert(-1) -dnl -dnl Define some useful color variables -dnl -define(`black', `0') -define(`red', `1') -define(`green', `2') -define(`brown', `3') -define(`blue', `4') -define(`magenta', `5') -define(`cyan', `6') -define(`white', `7') -dnl -dnl Mark macro arguments: regexp foreground-color [background-color] -dnl -define(`mark', ``mark "$1"'' `ifelse(`$#', `3', ``"\033[3$2;4$3m"'', ``"\033[3$2m"'')' `"\033[m"') -dnl -divert -mark(`Jenkins',blue) -mark(`unstable',brown) -mark(`became',became) -mark(`failed',red) -mark(` stable',green) -mark(`<.*>',cyan) - diff --git a/update_jdn.sh b/update_jdn.sh index 408202ee..ecdf2c49 100755 --- a/update_jdn.sh +++ b/update_jdn.sh @@ -23,7 +23,7 @@ done # install packages we need # (more or less grouped into more-then-nice-to-have, needed-while-things-are-new, needed) # -sudo apt-get install vim screen less etckeeper moreutils curl mtr-tiny dstat devscripts bash-completion shorewall shorewall6 cron-apt apt-listchanges munin calamaris visitors procmail libjson-rpc-perl libfile-touch-perl dict \ +sudo apt-get install vim screen less etckeeper moreutils curl mtr-tiny dstat devscripts bash-completion shorewall shorewall6 cron-apt apt-listchanges munin calamaris visitors procmail libjson-rpc-perl libfile-touch-perl \ build-essential python-setuptools \ debootstrap sudo figlet graphviz apache2 python-yaml python-pip mr subversion subversion-tools vnstat webcheck poxml explain "Packages installed." |