cookutils rev 905
cook: got separate {pre;post}_{install;remove} functions for every package; tweak copy(); lighttpd/index.cgi: fix links with '+' in activity log.
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Sat May 27 16:23:38 2017 +0300 (2017-05-27) |
parents | d41948eec3e6 |
children | dba59a5ecc00 |
files | cook lighttpd/index.cgi |
line diff
1.1 --- a/cook Fri May 26 16:22:26 2017 +0300 1.2 +++ b/cook Sat May 27 16:23:38 2017 +0300 1.3 @@ -845,12 +845,17 @@ 1.4 [ -n "$DEPENDS" ] && echo "DEPENDS=\"$DEPENDS\"" | tr -ds '\t' ' ' 1.5 [ -n "$PROVIDE" ] && echo "PROVIDE=\"$PROVIDE\"" 1.6 1.7 - # Extract {pre,post}_{install,remove} functions 1.8 + # Extract {pre,post}_{install,remove} functions; 1.9 + # post_install_gtk_() will be copied as post_install() for gtk+ package 1.10 + # 1.11 + # restricted name (gtk+ -> gtk_; acl-dev -> acl_dev) 1.12 + rname=$(echo -n $PACKAGE | tr -c 'a-zA-Z0-9' '_') 1.13 for i in pre post; do 1.14 for j in install remove; do 1.15 - if grep -q "^${i}_$j()" "$orig_receipt"; then 1.16 + if grep -q "^${i}_${j}_$rname()" "$orig_receipt"; then 1.17 echo 1.18 - sed "/^${i}_$j()/,/}/!d" "$orig_receipt" 1.19 + sed "/^${i}_${j}_$rname()/,/}/!d" "$orig_receipt" | \ 1.20 + sed "s|^${i}_${j}_$rname()|${i}_${j}()|" 1.21 fi 1.22 done 1.23 done 1.24 @@ -1254,7 +1259,7 @@ 1.25 @std) 1.26 # Copy "standard" files (all but "developer files", man pages, documentation, translations) 1.27 sed '/\.h$/d; /\.hxx$/d; /\.a$/d; /\.la$/d; /\.pc$/d; /bin\/.*-config$/d; 1.28 - /\.m4$/d; /\.gir$/d; /\.typelib$/d; /\.vapi$/d; /\.deps$/d; 1.29 + /\.m4$/d; /\.gir$/d; /\.typelib$/d; /\.vapi$/d; /\.deps$/d; /\.cmake$/d; 1.30 /\/include\//d; 1.31 /\/share\/man\//d; /\/share\/doc\//d; /\/share\/gtk-doc\//d; /\/share\/info\//d; 1.32 /\/share\/devhelp\//d; /\/share\/locale\//d; 1.33 @@ -1268,7 +1273,7 @@ 1.34 @dev) 1.35 # Copy "developer files" 1.36 sed -n '/\.h$/p; /\.hxx$/p; /\.a$/p; /\.la$/p; /\.pc$/p; /bin\/.*-config$/p; 1.37 - /\.m4$/p; /\.gir$/p; /\.typelib$/p; /\.vapi$/p; /\.deps$/p; 1.38 + /\.m4$/p; /\.gir$/p; /\.typelib$/p; /\.vapi$/p; /\.deps$/p; /\.cmake$/p; 1.39 /\/include\//p; 1.40 ' $filelist | \ 1.41 while read j; do
2.1 --- a/lighttpd/index.cgi Fri May 26 16:22:26 2017 +0300 2.2 +++ b/lighttpd/index.cgi Sat May 27 16:23:38 2017 +0300 2.3 @@ -707,7 +707,7 @@ 2.4 [ "$list" == 'cooklist' ] && nb="- Packages: $(wc -l < $cooklist)" 2.5 echo '<section id="content2">' 2.6 echo "<h2>DB: $list $nb</h2>" 2.7 - tac $CACHE/$list | sed 's|cooker.cgi?pkg=||; 2.8 + tac $CACHE/$list | sed 's|cooker.cgi?pkg=||; s|%2B|+|g; 2.9 s|\[ Done|<span class="r c20">Done|; 2.10 s|\[ Failed|<span class="r c10">Failed|; 2.11 s| \]|</span>|' | mktable $list