summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/email2irc.sh3
-rwxr-xr-xupdate_jdn.sh4
2 files changed, 4 insertions, 3 deletions
diff --git a/bin/email2irc.sh b/bin/email2irc.sh
index 81017910..f800921b 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
- kgb-client --conf /srv/jenkins/kgb/$CHANNEL.conf --relay-msg "$SUBJECT. $FIRST_LINE" && echo "kgb informed successfully." >> $LOGFILE
+ MESSAGE=$(echo "$SUBJECT. $FIRST_LINE" | colorit -c /etc/colorit.conf )
+ kgb-client --conf /srv/jenkins/kgb/$CHANNEL.conf --relay-msg "$MESSAGE" && echo "kgb informed successfully." >> $LOGFILE
echo >> $LOGFILE
else
echo "But no irc channel detected." >> $LOGFILE
diff --git a/update_jdn.sh b/update_jdn.sh
index 46db68f4..c5bd743d 100755
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -23,9 +23,9 @@ 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 \
+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 dict \
build-essential python-setuptools \
- debootstrap sudo figlet graphviz apache2 python-yaml python-pip mr subversion subversion-tools vnstat webcheck procmail libjson-rpc-perl poxml
+ debootstrap sudo figlet graphviz apache2 python-yaml python-pip mr subversion subversion-tools vnstat webcheck poxml
explain "Packages installed."
#