cookutils diff cookiso @ rev 979
lighttpd/index.cgi: try to improve links in the top "Debug information" block.
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Tue Oct 17 14:25:04 2017 +0300 (2017-10-17) |
parents | 63fb59f6fd67 |
children | ac5d3d0f9b3c |
line diff
1.1 --- a/cookiso Sat Aug 26 11:51:39 2017 +0300 1.2 +++ b/cookiso Tue Oct 17 14:25:04 2017 +0300 1.3 @@ -100,12 +100,12 @@ 1.4 1.5 log() { 1.6 grep ^[A-Z] | \ 1.7 - sed s"#^[A-Z]\([^']*\)#$(date '+%F %R') : \0#" >> $activity 1.8 + sed "s#^[A-Z]\([^']*\)#$(date '+%F %R') : \0#" >> $activity 1.9 } 1.10 1.11 1.12 log_bot() { 1.13 - sed '/^.\//'d | sed '/^.hg/'d | tee -a $rollog 1.14 + sed '/^.\//d' | sed '/^.hg/d' | tee -a $rollog 1.15 } 1.16 1.17 1.18 @@ -113,7 +113,7 @@ 1.19 1.20 gen_flavors() { 1.21 cd $SLITAZ/flavors 1.22 - [ -d ".hg" ] && hg pull -u 1.23 + [ -d ".hg" -a -n "$(which hg)" ] && hg pull -u 1.24 mkdir -p $cache; cd $cache 1.25 rm -rf *.flavor *.list *.conf *.sh 1.26 for flavor in $flavors; do 1.27 @@ -122,6 +122,7 @@ 1.28 else 1.29 name="slitaz-$string" 1.30 fi 1.31 + 1.32 log="$iso/$name.log" 1.33 for i in $(seq 9 -1 1); do # Rotate log 1.34 j=$(($i - 1)) 1.35 @@ -129,7 +130,9 @@ 1.36 done 1.37 [ -e $log ] && mv $log $log.0 1.38 touch $log 1.39 + 1.40 echo "Building $string <a href='?distro=$string-$flavor'>$flavor</a>" | log 1.41 + 1.42 echo "Cookiso started: $(date '+%F %R')" | tee -a $log 1.43 tazlito pack-flavor $flavor | tee -a $log 1.44 tazlito get-flavor $flavor | tee -a $log