cookutils rev 55
cook: exit only if compile_rules fails not each time...
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Sat May 07 13:33:21 2011 +0200 (2011-05-07) |
parents | 7cfa8aa2860a |
children | 147bded5c460 |
files | cook |
line diff
1.1 --- a/cook Sat May 07 12:05:34 2011 +0100 1.2 +++ b/cook Sat May 07 13:33:21 2011 +0200 1.3 @@ -400,10 +400,10 @@ 1.4 # Execute receipt rules. 1.5 if grep -q ^compile_rules $receipt; then 1.6 gettext -e "Executing: compile_rules\n" 1.7 - [ -d "$src" ] && cd $src 1.8 - compile_rules || echo "" && exit 1 1.9 + [ -d "$src" ] && cd $src 1.10 + compile_rules || (echo "" && exit 1) 1.11 # Stay compatible with _pkg 1.12 - [ -d $src/_pkg ] && mv $src/_pkg $install 1.13 + [ -d "$src/_pkg" ] && mv $src/_pkg $install 1.14 # QA: compile_rules success so valid. 1.15 mkdir -p $install 1.16 else 1.17 @@ -429,7 +429,7 @@ 1.18 # but it dont handle EXTRAVERSION. 1.19 packit() { 1.20 set_paths 1.21 - echo -e "\nPack: $PACKAGE $VERSION" 1.22 + echo "Pack: $PACKAGE $VERSION" 1.23 separator 1.24 if grep -q ^genpkg_rules $receipt; then 1.25 gettext -e "Executing: genpkg_rules\n"