SliTaz Repositories

     1.1 --- a/web/cooker.cgi	Sat May 07 15:22:01 2011 +0100
     1.2 +++ b/web/cooker.cgi	Sat May 07 17:38:17 2011 +0200
     1.3 @@ -34,7 +34,7 @@
     1.4  				-e 's#no$#<span class="span-no">no</span>#g' \
     1.5  				-e 's#error$#<span class="span-error">error</span>#g' \
     1.6  				-e 's#ERROR:#<span class="span-error">ERROR:</span>#g' \
     1.7 -				-e s"#^Executing:\([^']*\).#<span class='span-sky'>\0</span>#"g \
     1.8 +				-e s"#^Executing:\([^']*\).#<span class='sh-val'>\0</span>#"g \
     1.9  				-e s"#^====\([^']*\).#<span class='span-line'>\0</span>#"g \
    1.10  				-e s"#^[a-zA-Z0-9]\([^']*\) :: #<span class='span-sky'>\0</span>#"g \
    1.11  				-e s"#ftp://\([^']*\).*#<a href='\0'>\0</a>#"g	\
    1.12 @@ -121,23 +121,34 @@
    1.13  		else
    1.14  			echo "<pre>No log: $pkg</pre>"
    1.15  		fi ;;
    1.16 -	log=*)
    1.17 -		log=${QUERY_STRING#log=}
    1.18 -		file=$LOGS/$log.log
    1.19 -		echo "<h2>Log for: $log</h2>"
    1.20 -		if [ -f "$LOGS/$log.log" ]; then
    1.21 -			if fgrep -q "Summary" $file; then
    1.22 +	file=*)
    1.23 +		# Dont allown all files on the system for security reason.
    1.24 +		file=${QUERY_STRING#file=}
    1.25 +		case "$file" in
    1.26 +			activity|cooknotes)
    1.27 +				echo "<h2>DB: $file</h2>"
    1.28  				echo '<pre>'
    1.29 -				grep -A 8 "^Summary" $file | sed /^$/d | \
    1.30 -					syntax_highlighter log
    1.31 -				echo '</pre>'
    1.32 -			fi
    1.33 -			echo '<pre>'
    1.34 -			cat $file | syntax_highlighter log
    1.35 -			echo '</pre>'
    1.36 -		else
    1.37 -			echo "<pre>No log for: $log</pre>"
    1.38 -		fi ;;
    1.39 +				tac $CACHE/$file | \
    1.40 +					sed s"#^\([^']* : \)#<span class='log-date'>\0</span>#"g
    1.41 +				echo '</pre>' ;;
    1.42 +			*.log)
    1.43 +				file=$LOGS/$file
    1.44 +				name=$(basename $file)
    1.45 +				echo "<h2>Log for: ${name%.log}</h2>"
    1.46 +				if [ -f "$LOGS/$log.log" ]; then
    1.47 +					if fgrep -q "Summary" $file; then
    1.48 +						echo '<pre>'
    1.49 +						grep -A 8 "^Summary" $file | sed /^$/d | \
    1.50 +							syntax_highlighter log
    1.51 +						echo '</pre>'
    1.52 +					fi
    1.53 +					echo '<pre>'
    1.54 +					cat $file | syntax_highlighter log
    1.55 +					echo '</pre>'
    1.56 +				else
    1.57 +					echo "<pre>No log for: $log</pre>"
    1.58 +				fi ;;
    1.59 +		esac ;;
    1.60  	receipt=*)
    1.61  		pkg=${QUERY_STRING#receipt=}
    1.62  		echo "<h2>Receipt for: $pkg</h2>"
    1.63 @@ -164,23 +175,29 @@
    1.64  Packages in wok  : $(ls $WOK | wc -l)
    1.65  Wok revision     : <a href="http://hg.slitaz.org/wok">$(cd $WOK && hg head --template '{rev}\n')</a>
    1.66  Commits to cook  : $(cat $commits | wc -l)
    1.67 +Current cooklist : $(cat $cooklist | wc -l)
    1.68  Broken packages  : $(cat $broken | wc -l)
    1.69  </pre>
    1.70  
    1.71  <div id="info">
    1.72 -	Latest logs: <a href="cooker.cgi?log=cookorder">cookorder</a>
    1.73 -	<a href="cooker.cgi?log=commits">commits</a>
    1.74 +	Logs:
    1.75 +	<a class="button" href="cooker.cgi?file=cookorder.log">cookorder</a>
    1.76 +	<a class="button" href="cooker.cgi?file=commits.log">commits</a>
    1.77  </div>
    1.78  
    1.79  <h2>Activity</h2>
    1.80  <pre>
    1.81 -$(tac $CACHE/activity | sed s"#^\([^']* : \)#<span class='log-date'>\0</span>#"g)
    1.82 +$(tac $CACHE/activity | head -n 12 | \
    1.83 +	sed s"#^\([^']* : \)#<span class='log-date'>\0</span>#"g)
    1.84  </pre>
    1.85 +<a class="button" href="cooker.cgi?file=activity">More activity</a>
    1.86  
    1.87  <h2>Cooknotes</h2>
    1.88  <pre>
    1.89 -$(cat $cooknotes)
    1.90 +$(tac $cooknotes | head -n 12 | \
    1.91 +	sed s"#^\([^']* : \)#<span class='log-date'>\0</span>#"g)
    1.92  </pre>
    1.93 +<a class="button" href="cooker.cgi?file=cooknotes">More notes</a>
    1.94  
    1.95  <h2>Commits</h2>
    1.96  <pre>