cookutils rev 517 slitaz-tank
Merge default.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Sun Jul 29 03:27:59 2012 +0000 (2012-07-29) |
parents | 705c59ee45fd 27648cf2bf92 |
children | 6ffcfca5ad36 |
files | cook cook.conf cookiso web/cooker.cgi |
line diff
1.1 --- a/cookiso Sun Jul 29 03:08:32 2012 +0000 1.2 +++ b/cookiso Sun Jul 29 03:27:59 2012 +0000 1.3 @@ -98,7 +98,7 @@ 1.4 gen_flavors() { 1.5 cd $SLITAZ/flavors && hg pull -u 1.6 mkdir -p $cache && cd $cache 1.7 - rm -rf *.flavor *.list *.conf 1.8 + rm -rf *.flavor *.list *.conf *.sh 1.9 for flavor in $flavors 1.10 do 1.11 if [ "$flavor" != "core-4in1" ]; then
2.1 --- a/web/cooker.cgi Sun Jul 29 03:08:32 2012 +0000 2.2 +++ b/web/cooker.cgi Sun Jul 29 03:27:59 2012 +0000 2.3 @@ -64,8 +64,8 @@ 2.4 -e s"#^Executing:\([^']*\).#<span class='sh-val'>\0</span>#"g \ 2.5 -e s"#^====\([^']*\).#<span class='span-line'>\0</span>#"g \ 2.6 -e s"#^[a-zA-Z0-9]\([^']*\) :: #<span class='span-sky'>\0</span>#"g \ 2.7 - -e s"#ftp://\([^']*\).*#<a href='\0'>\0</a>#"g \ 2.8 - -e s"#http://\([^']*\).*#<a href='\0'>\0</a>#"g ;; 2.9 + -e s"#ftp://[^ '\"]*#<a href='\0'>\0</a>#"g \ 2.10 + -e s"#http://[^ '\"]*#<a href='\0'>\0</a>#"g ;; 2.11 receipt) 2.12 sed -e s'|&|\&|g' -e 's|<|\<|g' -e 's|>|\>|'g \ 2.13 -e s"#^\#\([^']*\)#<span class='sh-comment'>\0</span>#"g \ 2.14 @@ -258,10 +258,20 @@ 2.15 echo "<pre>No log file: $log</pre>" 2.16 fi ;; 2.17 esac ;; 2.18 + stuff=*) 2.19 + file=${QUERY_STRING#stuff=} 2.20 + echo "<h2>$file</h2>" 2.21 + echo '<pre>' 2.22 + cat $wok/$file 2.23 + echo '</pre>' ;; 2.24 receipt=*) 2.25 pkg=${QUERY_STRING#receipt=} 2.26 echo "<h2>Receipt for: $pkg</h2>" 2.27 if [ -f "$WOK/$pkg/receipt" ]; then 2.28 + ( cd $wok/$pkg ; find stuff -type f 2> /dev/null ) | \ 2.29 + while read file ; do 2.30 + echo "<a href=\"?stuff=$pkg/$file\">$file</a>" 2.31 + done 2.32 echo '<pre>' 2.33 cat $WOK/$pkg/receipt | syntax_highlighter receipt 2.34 echo '</pre>'