cookutils rev 279
cook: receipt variables may use variables
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu Jan 19 08:21:34 2012 +0100 (2012-01-19) |
parents | 9f1f08cddbc8 |
children | fc45475d830c |
files | cook |
line diff
1.1 --- a/cook Sun Jan 08 13:32:33 2012 +0100 1.2 +++ b/cook Thu Jan 19 08:21:34 2012 +0100 1.3 @@ -130,7 +130,7 @@ 1.4 for var in PACKAGE VERSION CATEGORY SHORT_DESC MAINTAINER WEB_SITE 1.5 do 1.6 unset value 1.7 - value=$(grep ^$var= $receipt | cut -d \" -f 2) 1.8 + value="$(. $receipt ; eval echo \$$var)" 1.9 case "$var" in 1.10 PACKAGE|VERSION|SHORT_DESC) 1.11 if_empty_value ;; 1.12 @@ -739,15 +739,16 @@ 1.13 mkinstall_list() { 1.14 local pkg 1.15 for pkg in $@ ; do 1.16 - [ -s /home/slitaz/wok/$pkg/receipt ] && 1.17 case " $INSTALL_LIST " in 1.18 *\ $pkg\ *) continue ;; 1.19 - *) unset DEPENDS 1.20 - . /home/slitaz/wok/$pkg/receipt 1.21 - INSTALL_LIST="$INSTALL_LIST $pkg" 1.22 - [ -n "$DEPENDS" ] && mkinstall_list $DEPENDS 1.23 + *) if [ -s /home/slitaz/wok/$pkg/receipt ]; then 1.24 + unset DEPENDS 1.25 + . /home/slitaz/wok/$pkg/receipt 1.26 + INSTALL_LIST="$INSTALL_LIST $pkg" 1.27 + [ -n "$DEPENDS" ] && mkinstall_list $DEPENDS 1.28 + fi 1.29 + echo $pkg 1.30 esac 1.31 - echo $pkg 1.32 done 1.33 } 1.34