cookutils rev 18
Add some cook date and display cooklist in web interface
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Thu May 05 19:09:32 2011 +0200 (2011-05-05) |
parents | c3c30b1506b8 |
children | f02a85a1f33d |
files | cook cooker web/cooker.cgi |
line diff
1.1 --- a/cook Thu May 05 17:45:44 2011 +0200 1.2 +++ b/cook Thu May 05 19:09:32 2011 +0200 1.3 @@ -198,14 +198,16 @@ 1.4 fs=$(du -sh taz/* | awk '{print $1}') 1.5 size=$(du -sh $PKGS/$PACKAGE-${VERSION}*.tazpkg | awk '{print $1}') 1.6 files=$(cat taz/$PACKAGE-*/files.list | wc -l) 1.7 + cookdate=$(date "+%Y-%m-%d %H:%M") 1.8 gettext "Summary for:"; echo " $PACKAGE $VERSION" 1.9 separator 1.10 [ "$prod" ] && echo "Produce : $prod" 1.11 cat << EOT 1.12 Packed : $fs 1.13 Compressed : $size 1.14 +Files : $files 1.15 Cook time : ${time}s 1.16 -Files : $files 1.17 +Cook date : $cookdate 1.18 $(separator) 1.19 1.20 EOT 1.21 @@ -672,7 +674,7 @@ 1.22 # Finally we DONT WANT to build the *-dev or packages with WANTED="$pkg" 1.23 # You want automation: use the Cooker Build Bot. 1.24 #[ -d "$WOK/$pkg-dev" ] && cook $pkg-dev 1.25 - ;; 1.26 + rm -f $command ;; 1.27 esac 1.28 1.29 exit 0
2.1 --- a/cooker Thu May 05 17:45:44 2011 +0200 2.2 +++ b/cooker Thu May 05 19:09:32 2011 +0200 2.3 @@ -300,6 +300,7 @@ 2.4 new=$(hg head --template '{rev}\n') 2.5 echo "Hg wok revision : $cur" | log_commits 2.6 echo "Pulled revision : $new" | log_commits 2.7 + echo "Check date : $(date '+%Y-%m-%d %H:%M')" | log_commits 2.8 2.9 # Sync build wok with rsync so we dont take care about removing old 2.10 # files as before.
3.1 --- a/web/cooker.cgi Thu May 05 17:45:44 2011 +0200 3.2 +++ b/web/cooker.cgi Thu May 05 19:09:32 2011 +0200 3.3 @@ -83,19 +83,14 @@ 3.4 log=$LOGS/$pkg.log 3.5 echo "<h2>Package: $pkg</h2>" 3.6 3.7 - # Package info 3.8 + # Package info. 3.9 + echo '<div id="info">' 3.10 if [ -f "$wok/$pkg/receipt" ]; then 3.11 - . $wok/$pkg/receipt 3.12 - tazpkg=$PKGS/$pkg-${VERSION}.tazpkg 3.13 - if [ -f "$tazpkg" ]; then 3.14 - 3.15 - cooked=$(stat -c '%y' $tazpkg | cut -d . -f 1 | sed s/:[0-9]*$//) 3.16 - echo $cooked 3.17 - fi 3.18 echo "<a href='cooker.cgi?receipt=$pkg'>receipt</a>" 3.19 else 3.20 - echo "<p>No package named: $pkg<p>" 3.21 + echo "No package named: $pkg" 3.22 fi 3.23 + echo '</div>' 3.24 3.25 # Check for a log file and display summary if exist. 3.26 if [ -f "$log" ]; then 3.27 @@ -129,6 +124,12 @@ 3.28 file=$LOGS/$log.log 3.29 echo "<h2>Log for: $log</h2>" 3.30 if [ -f "$LOGS/$log.log" ]; then 3.31 + if fgrep -q "Summary" $file; then 3.32 + echo '<pre>' 3.33 + grep -A 8 "^Summary" $file | sed /^$/d | \ 3.34 + syntax_highlighter log 3.35 + echo '</pre>' 3.36 + fi 3.37 echo '<pre>' 3.38 cat $file | syntax_highlighter log 3.39 echo '</pre>' 3.40 @@ -164,9 +165,9 @@ 3.41 Broken packages : $(cat $broken | wc -l) 3.42 </pre> 3.43 3.44 -<div> 3.45 -Latest logs: <a href="cooker.cgi?log=cookorder">cookorder</a> 3.46 -<a href="cooker.cgi?log=commits">commits</a> 3.47 +<div id="info"> 3.48 + Latest logs: <a href="cooker.cgi?log=cookorder">cookorder</a> 3.49 + <a href="cooker.cgi?log=commits">commits</a> 3.50 </div> 3.51 3.52 <h2>Activity</h2> 3.53 @@ -179,6 +180,11 @@ 3.54 $(cat $commits) 3.55 </pre> 3.56 3.57 +<h2>Cooklist</h2> 3.58 +<pre> 3.59 +$(cat $cooklist) 3.60 +</pre> 3.61 + 3.62 <h2>Broken</h2> 3.63 <pre> 3.64 $(cat $broken | sed s"#^[^']*#<a href='cooker.cgi?log=\0'>\0</a>#"g)