- crux-commits - lists.crux.nu

r1486 - tools/scripts
by crux＠crux.nu 02 Jun '06

02 Jun '06

Author: jw Date: 2006-06-02 19:59:01 +0200 (Fri, 02 Jun 2006) New Revision: 1486 Modified: tools/scripts/check_urls Log: check_urls: fix css class Modified: tools/scripts/check_urls =================================================================== --- tools/scripts/check_urls 2006-06-02 17:48:37 UTC (rev 1485) +++ tools/scripts/check_urls 2006-06-02 17:59:01 UTC (rev 1486) @@ -138,7 +138,7 @@ echo "</style></head><body>" >> $HTMLLOG echo "<h1>check_urls report for $(date)</h1>" >> $HTMLLOG cat $LOGFILE|sort --field-separator="|" -n|\ - awk -F\| '/.*/ { print "<p ><h3 class=\""$4"\">"$2"</h3>" \ + awk -F\| '/.*/ { print "<p ><h3 class=\""$5"\">"$2"</h3>" \ "<b>URL:</b><a href=\""$3"\"> "$3"</a><br>" \ "<b>Status:</b> "$5"<br>" \ "<b>Reason:</b> "$4"<br>" \

1 0

r1485 - tools/scripts
by crux＠crux.nu 02 Jun '06

02 Jun '06

Author: jw Date: 2006-06-02 19:48:37 +0200 (Fri, 02 Jun 2006) New Revision: 1485 Modified: tools/scripts/check_urls Log: check_urls: create links in html report Modified: tools/scripts/check_urls =================================================================== --- tools/scripts/check_urls 2006-06-02 17:31:08 UTC (rev 1484) +++ tools/scripts/check_urls 2006-06-02 17:48:37 UTC (rev 1485) @@ -139,7 +139,7 @@ echo "<h1>check_urls report for $(date)</h1>" >> $HTMLLOG cat $LOGFILE|sort --field-separator="|" -n|\ awk -F\| '/.*/ { print "<p ><h3 class=\""$4"\">"$2"</h3>" \ - "<b>URL:</b> "$3"<br>" \ + "<b>URL:</b><a href=\""$3"\"> "$3"</a><br>" \ "<b>Status:</b> "$5"<br>" \ "<b>Reason:</b> "$4"<br>" \ "<b>Open since:</b>" strftime("%c",$1) "</p>";}' >> $HTMLLOG

1 0

r1484 - tools/scripts
by crux＠crux.nu 02 Jun '06

02 Jun '06

Author: jw Date: 2006-06-02 19:31:08 +0200 (Fri, 02 Jun 2006) New Revision: 1484 Modified: tools/scripts/check_urls Log: check_urls: unique state files (per file, not per port) Modified: tools/scripts/check_urls =================================================================== --- tools/scripts/check_urls 2006-06-02 17:10:17 UTC (rev 1483) +++ tools/scripts/check_urls 2006-06-02 17:31:08 UTC (rev 1484) @@ -42,43 +42,42 @@ check_notify() { local portpath=$1 local port=$(echo $portpath|sed -e 's|/|_|g') + local file=$port.$(basename $2) local url=$2 local cause=$3 - if [ -f $PORT_STATES/$port.created ]; then -# debug "Known problem '$port', first detected on \ -# $(cat $PORT_STATES/$port.created|awk '{print strftime("%c",$1)}')" + if [ -f $PORT_STATES/$file.created ]; then - log "$(cat $PORT_STATES/$port.created)" \ - "$portpath" "$(cat $PORT_STATES/$port.cause)" \ + log "$(cat $PORT_STATES/$file.created)" \ + "$portpath" $url "$(cat $PORT_STATES/$file.cause)" \ "KNOWN" - notify_date=$(cat $PORT_STATES/$port.notified) + notify_date=$(cat $PORT_STATES/$file.notified) now=$(date +%s) delta=$((now - notify_date)) # debug "Delta: $delta" - if [ ! "$(cat $PORT_STATES/$port.cause)" = "$cause" ]; then + if [ ! "$(cat $PORT_STATES/$file.cause)" = "$cause" ]; then notify "$portpath" $url "$cause" "Changed reason" - echo $now > $PORT_STATES/$port.notified - echo $cause > $PORT_STATES/$port.cause + echo $now > $PORT_STATES/$file.notified + echo $cause > $PORT_STATES/$file.cause elif [ $delta -gt $NOTIFY_DELTA ]; then notify "$portpath" $url "$cause" "Reminder" - echo $now > $PORT_STATES/$port.notified + echo $now > $PORT_STATES/$file.notified fi - date +%s > $PORT_STATES/$port.revisited + date +%s > $PORT_STATES/$file.revisited else datestr=$(date +%s) notify "$portpath" $url "$cause" "New" - log $datestr $portpath "$cause" "NEW" + log $datestr $portpath $url "$cause" "NEW" - echo $datestr > $PORT_STATES/$port.created - echo $datestr > $PORT_STATES/$port.revisited - echo $datestr > $PORT_STATES/$port.notified - echo $cause > $PORT_STATES/$port.cause + echo $datestr > $PORT_STATES/$file.created + echo $datestr > $PORT_STATES/$file.revisited + echo $datestr > $PORT_STATES/$file.notified + echo $cause > $PORT_STATES/$file.cause fi } @@ -120,7 +119,8 @@ name=$(echo $base|sed -e 's|_|/|g') if [ $delta -gt $REMOVE_DELTA ]; then - log $now $name "$(cat $PORT_STATES/$base.cause) [solved]" "RESOLVED" + log $now $name "" \ + "$(cat $PORT_STATES/$base.cause) [solved]" "RESOLVED" rm -r $PORT_STATES/$base.* fi done @@ -139,8 +139,9 @@ echo "<h1>check_urls report for $(date)</h1>" >> $HTMLLOG cat $LOGFILE|sort --field-separator="|" -n|\ awk -F\| '/.*/ { print "<p ><h3 class=\""$4"\">"$2"</h3>" \ - "<b>Status:</b> "$4"<br>" \ - "<b>Reason:</b> "$3"<br>" \ + "<b>URL:</b> "$3"<br>" \ + "<b>Status:</b> "$5"<br>" \ + "<b>Reason:</b> "$4"<br>" \ "<b>Open since:</b>" strftime("%c",$1) "</p>";}' >> $HTMLLOG echo "</body></html>" >> $HTMLLOG }

1 0

r1483 - tools/scripts
by crux＠crux.nu 02 Jun '06

02 Jun '06

Author: jw Date: 2006-06-02 19:10:17 +0200 (Fri, 02 Jun 2006) New Revision: 1483 Modified: tools/scripts/check_urls Log: check_urls: small fixes, set time deltas Modified: tools/scripts/check_urls =================================================================== --- tools/scripts/check_urls 2006-06-02 15:58:05 UTC (rev 1482) +++ tools/scripts/check_urls 2006-06-02 17:10:17 UTC (rev 1483) @@ -10,16 +10,22 @@ HTMLLOG=$STATE_DIR/state.html PORT_STATES=$STATE_DIR/ports/ -NOTIFY_DELTA=10 # seconds -REMOVE_DELTA=20 +FROM=crux(a)crux.nu +TO=jw@localhost +NOTIFY_DELTA=604800 # 7 days +REMOVE_DELTA=172800 # 2 days + notify() { local port=$1 local url=$2 local cause=$3 local state=$4 - echo "==> Notify: $port, Url: $url Reason: $2, State: $3" + echo -e "Port: $port\n" \ + "Url: $url\n" \ + "Reason: $3\n" \ + "State: $state\n" } log() { @@ -54,11 +60,11 @@ # debug "Delta: $delta" if [ ! "$(cat $PORT_STATES/$port.cause)" = "$cause" ]; then - notify "$portpath" "$cause" "Changed reason" + notify "$portpath" $url "$cause" "Changed reason" echo $now > $PORT_STATES/$port.notified echo $cause > $PORT_STATES/$port.cause elif [ $delta -gt $NOTIFY_DELTA ]; then - notify "$portpath" "$cause" "Reminder" + notify "$portpath" $url "$cause" "Reminder" echo $now > $PORT_STATES/$port.notified fi @@ -66,7 +72,7 @@ else datestr=$(date +%s) - notify "$portpath" "$cause" "New" + notify "$portpath" $url "$cause" "New" log $datestr $portpath "$cause" "NEW" echo $datestr > $PORT_STATES/$port.created @@ -139,6 +145,7 @@ echo "</body></html>" >> $HTMLLOG } + ########## @@ -152,4 +159,3 @@ cleanup_states htmlify -

1 0

r1482 - tools/scripts
by crux＠crux.nu 02 Jun '06

02 Jun '06

Author: jw Date: 2006-06-02 17:58:05 +0200 (Fri, 02 Jun 2006) New Revision: 1482 Modified: tools/scripts/check_urls Log: check_urls: Add title to html report Modified: tools/scripts/check_urls =================================================================== --- tools/scripts/check_urls 2006-06-02 15:35:05 UTC (rev 1481) +++ tools/scripts/check_urls 2006-06-02 15:58:05 UTC (rev 1482) @@ -125,10 +125,12 @@ return fi echo "<html><head><title>check_urls status</title><style type=\"text/css\">" > $HTMLLOG + echo "* { font-family: sans-serif; } " >> $HTMLLOG echo "h3 { background: #ff8888; } " >> $HTMLLOG echo "h3.NEW { background: #ffcccc; } " >> $HTMLLOG echo "h3.RESOLVED { background: #77ff77; } " >> $HTMLLOG echo "</style></head><body>" >> $HTMLLOG + echo "<h1>check_urls report for $(date)</h1>" >> $HTMLLOG cat $LOGFILE|sort --field-separator="|" -n|\ awk -F\| '/.*/ { print "<p ><h3 class=\""$4"\">"$2"</h3>" \ "<b>Status:</b> "$4"<br>" \

1 0

r1481 - tools/scripts
by crux＠crux.nu 02 Jun '06

02 Jun '06

Author: jw Date: 2006-06-02 17:35:05 +0200 (Fri, 02 Jun 2006) New Revision: 1481 Modified: tools/scripts/check_urls Log: print error for fixed errors Modified: tools/scripts/check_urls =================================================================== --- tools/scripts/check_urls 2006-06-02 13:19:32 UTC (rev 1480) +++ tools/scripts/check_urls 2006-06-02 15:35:05 UTC (rev 1481) @@ -114,7 +114,7 @@ name=$(echo $base|sed -e 's|_|/|g') if [ $delta -gt $REMOVE_DELTA ]; then - log $now $name "Solved" "RESOLVED" + log $now $name "$(cat $PORT_STATES/$base.cause) [solved]" "RESOLVED" rm -r $PORT_STATES/$base.* fi done

1 0

r1480 - crux-2.2/ports/opt/popt
by crux＠crux.nu 02 Jun '06

02 Jun '06

Author: jaeger Date: 2006-06-02 15:19:32 +0200 (Fri, 02 Jun 2006) New Revision: 1480 Modified: crux-2.2/ports/opt/popt/Pkgfile Log: popt: updated source URL Modified: crux-2.2/ports/opt/popt/Pkgfile =================================================================== --- crux-2.2/ports/opt/popt/Pkgfile 2006-06-02 13:18:25 UTC (rev 1479) +++ crux-2.2/ports/opt/popt/Pkgfile 2006-06-02 13:19:32 UTC (rev 1480) @@ -6,7 +6,7 @@ name=popt version=1.7 release=1 -source=(ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/$name-$version.tar.gz) +source=(http://gentoo.osuosl.org/distfiles/$name-$version.tar.gz) build() { cd $name-$version

1 0

r1479 - crux-2.2/ports/opt/vcdimager
by crux＠crux.nu 02 Jun '06

02 Jun '06

Author: jaeger Date: 2006-06-02 15:18:25 +0200 (Fri, 02 Jun 2006) New Revision: 1479 Modified: crux-2.2/ports/opt/vcdimager/Pkgfile Log: vcdimager: updated source URL Modified: crux-2.2/ports/opt/vcdimager/Pkgfile =================================================================== --- crux-2.2/ports/opt/vcdimager/Pkgfile 2006-06-02 13:16:07 UTC (rev 1478) +++ crux-2.2/ports/opt/vcdimager/Pkgfile 2006-06-02 13:18:25 UTC (rev 1479) @@ -6,7 +6,7 @@ name=vcdimager version=0.7.23 release=1 -source=(http://www.vcdimager.org/pub/$name/$name-0.7/$name-$version.tar.gz) +source=(ftp://ftp.gnu.org/gnu/vcdimager/$name-$version.tar.gz) build() { cd $name-$version

1 0

r1478 - crux-2.2/ports/opt/transcode
by crux＠crux.nu 02 Jun '06

02 Jun '06

Author: jaeger Date: 2006-06-02 15:16:07 +0200 (Fri, 02 Jun 2006) New Revision: 1478 Modified: crux-2.2/ports/opt/transcode/Pkgfile Log: transcode: updated source URL Modified: crux-2.2/ports/opt/transcode/Pkgfile =================================================================== --- crux-2.2/ports/opt/transcode/Pkgfile 2006-06-02 13:12:58 UTC (rev 1477) +++ crux-2.2/ports/opt/transcode/Pkgfile 2006-06-02 13:16:07 UTC (rev 1478) @@ -7,7 +7,7 @@ name=transcode version=1.0.2 release=1 -source=(http://www.jakemsr.com/$name/$name-$version.tar.gz \ +source=(http://www.kraymer.mynetcologne.de/$name-$version.tar.gz \ http://dl.sourceforge.net/subtitleripper/subtitleripper-0.3-4.tgz) build() {

1 0

r1477 - crux-2.2/ports/opt/thunderbird
by crux＠crux.nu 02 Jun '06

02 Jun '06

Author: jaeger Date: 2006-06-02 15:12:58 +0200 (Fri, 02 Jun 2006) New Revision: 1477 Modified: crux-2.2/ports/opt/thunderbird/.md5sum crux-2.2/ports/opt/thunderbird/Pkgfile Log: thunderbird: updated to version 1.5.0.4 Modified: crux-2.2/ports/opt/thunderbird/.md5sum =================================================================== --- crux-2.2/ports/opt/thunderbird/.md5sum 2006-06-02 12:05:28 UTC (rev 1476) +++ crux-2.2/ports/opt/thunderbird/.md5sum 2006-06-02 13:12:58 UTC (rev 1477) @@ -1,2 +1,2 @@ f346e07ab1a6ecb55cc7f08fda1306ce mozconfig -3f32b847330c9d58297147be19714962 thunderbird-1.5.0.2-source.tar.bz2 +ada9c163f5b26fe81958e7a85340811e thunderbird-1.5.0.4-source.tar.bz2 Modified: crux-2.2/ports/opt/thunderbird/Pkgfile =================================================================== --- crux-2.2/ports/opt/thunderbird/Pkgfile 2006-06-02 12:05:28 UTC (rev 1476) +++ crux-2.2/ports/opt/thunderbird/Pkgfile 2006-06-02 13:12:58 UTC (rev 1477) @@ -4,7 +4,7 @@ # Depends on: libidl, gtk, libjpeg, libpng, zlib, expat name=thunderbird -version=1.5.0.2 +version=1.5.0.4 release=1 source=(http://ftp.mozilla.org/pub/mozilla.org/$name/releases/$version/sour… \ mozconfig)

1 0