cookutils rev 923
cook: fix copying stuff/applications & stuff/licenses, don't update chroot twice in update_chroot(); lighttpd/index.cgi: reset percentage for packages with undefined previous cooking time.
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Sun Jun 11 00:01:29 2017 +0300 (2017-06-11) |
parents | 4dbff8522396 |
children | f4e577c714e2 |
files | cook lighttpd/index.cgi |
line diff
1.1 --- a/cook Fri Jun 09 00:24:05 2017 +0300 1.2 +++ b/cook Sun Jun 11 00:01:29 2017 +0300 1.3 @@ -462,7 +462,7 @@ 1.4 # Homemade desktop file(s) can be in stuff. 1.5 if [ -d "$stuff/applications" ]; then 1.6 mkdir -p $install/usr/share 1.7 - cp $stuff/applications $install/usr/share 1.8 + cp -a $stuff/applications $install/usr/share 1.9 fi 1.10 if [ -f "$stuff/$PACKAGE.desktop" ]; then 1.11 mkdir -p $install/usr/share/applications 1.12 @@ -472,7 +472,7 @@ 1.13 # Add custom licenses 1.14 if [ -d "$stuff/licenses" ]; then 1.15 mkdir -p $install/usr/share/licenses 1.16 - cp $stuff/licenses $install/usr/share/licenses/$PACKAGE 1.17 + cp -a $stuff/licenses $install/usr/share/licenses/$PACKAGE 1.18 fi 1.19 } 1.20 1.21 @@ -1119,7 +1119,8 @@ 1.22 # Update chroot with freshly rebuilt package: keep env up-to-date. 1.23 1.24 update_chroot() { 1.25 - for i in $pkg $SPLIT; do 1.26 + local PACKAGE="$pkg" 1.27 + for i in $(all_names); do 1.28 if [ -d "$root$INSTALLED/$i" ]; then 1.29 . /etc/slitaz/cook.conf 1.30 . $WOK/$pkg/taz/$i-$VERSION/receipt
2.1 --- a/lighttpd/index.cgi Fri Jun 09 00:24:05 2017 +0300 2.2 +++ b/lighttpd/index.cgi Sun Jun 11 00:01:29 2017 +0300 2.3 @@ -57,7 +57,7 @@ 2.4 2.5 running_command() { 2.6 state="$(cat $command)" 2.7 - local pct 2.8 + local pct='' 2.9 if [ -n "$state" ];then 2.10 echo -n "$state</td></tr><tr><td>Completion</td>" 2.11 set -- $(grep "^$state" $cooktime)