cookutils rev 900
Tiny edits
| author | Paul Issott <paul@slitaz.org> |
|---|---|
| date | Thu May 11 20:04:44 2017 +0100 (2017-05-11) |
| parents | ea11d3c96873 |
| children | da39bc22887e |
| files | cook doc/cookopts.txt lighttpd/README.md lighttpd/cooker.js lighttpd/index.cgi |
line diff
1.1 --- a/cook Thu May 11 00:36:43 2017 +0300 1.2 +++ b/cook Thu May 11 20:04:44 2017 +0100 1.3 @@ -530,7 +530,7 @@ 1.4 } 1.5 1.6 1.7 -# Automatic patch the sources. 1.8 +# Automatically patch the sources. 1.9 1.10 patchit() { 1.11 [ -f "$stuff/patches/series" ] || return 1.12 @@ -804,10 +804,10 @@ 1.13 1.14 . "$orig_receipt" 1.15 1.16 - # Is package splitted one? 1.17 + # Is package split one? 1.18 [ -n "$SPLIT" -a "${SPLIT/$pkg/}" != "$SPLIT" ]; splitted=$? 1.19 1.20 - # Manage splitted packages 1.21 + # Manage split packages 1.22 if $splitted; then 1.23 # For packages with empty $DEPENDS 1.24 [ -n "$DEPENDS" ] || DEPENDS="$PACKAGE"
2.1 --- a/doc/cookopts.txt Thu May 11 00:36:43 2017 +0300 2.2 +++ b/doc/cookopts.txt Thu May 11 20:04:44 2017 +0100 2.3 @@ -60,7 +60,7 @@ 2.4 2.5 !perlz 2.6 Default action is to strip POD (plain old documentation) from the Perl 2.7 - modules (*.pm) and programs (*.pl) files. 2.8 + modules (*.pm) and program (*.pl) files. 2.9 The presence of this option overrides the default action (Perl files will 2.10 not be stripped). 2.11 Note, if you disabled the cleaning by using the higher !strip option, Perl
3.1 --- a/lighttpd/README.md Thu May 11 00:36:43 2017 +0300 3.2 +++ b/lighttpd/README.md Thu May 11 20:04:44 2017 +0100 3.3 @@ -11,7 +11,7 @@ 3.4 3.5 Examples of human friendly URIs: 3.6 3.7 - * /busybox : the page contains all about busybox package 3.8 + * /busybox : the page contains all about a busybox package 3.9 * /busybox/receipt : the page with the busybox's receipt 3.10 * /busybox/files : the page with the file listing 3.11 * /busybox/file/bin/busybox : get the specified file 3.12 @@ -26,18 +26,18 @@ 3.13 Notes about logs 3.14 ---------------- 3.15 3.16 -Single resource should be associated with the discrete URI. But due to log 3.17 -rotation, glibc.log.2 become glibc.log.3 after package rebuilding. In such 3.18 -situation: 3.19 +Single resources should be associated with the discrete URI. But due to log 3.20 +rotation, glibc.log.2 becomes glibc.log.3 after package rebuilding. In such 3.21 +situations: 3.22 3.23 1. we can't point to the specified log and line within it (URI changed); 3.24 - 2. caching will fail, already cached log change the name. 3.25 + 2. caching will fail, already cached log changes the name. 3.26 3.27 -The solution implemented is virtually append log name with the UNIX timestamp 3.28 -of last modification of the log instead of sequental numbers. So, for example, 3.29 -'glibc.log.2' will virtually became 'glibc.log.1482699768'. To found the matched 3.30 +The solution implemented is to virtually append log name with the UNIX timestamp 3.31 +of last modification of the log instead of sequential numbers. So, for example, 3.32 +'glibc.log.2' will virtually became 'glibc.log.1482699768'. To find the matched 3.33 log we need to cycle among ten or less 'glibc.log*' physical files and compare 3.34 -the files modification date with date in question. 3.35 +the files modification date with the date in question. 3.36 3.37 3.38 Full list of implemented human friendly URIs
4.1 --- a/lighttpd/cooker.js Thu May 11 00:36:43 2017 +0300 4.2 +++ b/lighttpd/cooker.js Thu May 11 20:04:44 2017 +0100 4.3 @@ -1,6 +1,6 @@ 4.4 // 4.5 // Set of scripts for SliTaz Cooker 4.6 -// that make the better user interaction with it 4.7 +// that makes for better user interaction with it 4.8 // 4.9 4.10 4.11 @@ -38,14 +38,14 @@ 4.12 4.13 function stopUpdating() { 4.14 clearInterval(upID); 4.15 - // Also remove the table row containing gauge because it will be no actual anymore 4.16 + // Also remove the table row containing gauge because it will not be actual anymore 4.17 document.getElementById('pct').innerHTML = ''; 4.18 // first "parentElement" of gauge is <td>, second - is <tr> 4.19 document.getElementById('gauge').parentElement.parentElement.remove(); 4.20 } 4.21 4.22 4.23 -// Decide whether we need to update percentage 4.24 +// Decide whether we need to update percentages 4.25 4.26 if (typeof updatePkg !== 'undefined') 4.27 startUpdating(updatePkg); 4.28 @@ -73,7 +73,7 @@ 4.29 } 4.30 4.31 4.32 -// Resize the iframe containing document to fit it's height without scrolling 4.33 +// Resize the iframe containing document to fit its height without scrolling 4.34 4.35 function resizeIframe(theframe) { 4.36 var height = theframe.contentWindow.document.body.scrollHeight;
5.1 --- a/lighttpd/index.cgi Thu May 11 00:36:43 2017 +0300 5.2 +++ b/lighttpd/index.cgi Thu May 11 20:04:44 2017 +0100 5.3 @@ -698,7 +698,7 @@ 5.4 else 5.5 toolchain="slitaz-toolchain/" 5.6 fi 5.7 - # Main page with summary. Count only package include in ARCH, 5.8 + # Main page with summary. Count only packages included in ARCH, 5.9 # use 'cooker arch-db' to manually create arch.$ARCH files. 5.10 inwok=$(ls $WOK/*/arch.$ARCH | wc -l) 5.11 cooked=$(ls $PKGS/*.tazpkg | wc -l) 5.12 @@ -936,7 +936,7 @@ 5.13 # find main package 5.14 wanted=$(. $wok/$pkg/receipt; echo $WANTED) 5.15 main=${wanted:-$pkg} 5.16 - # identify splitted packages 5.17 + # identify split packages 5.18 split="$main $(. $wok/$main/receipt; echo $SPLIT)" 5.19 [ -d "$wok/$main-dev" ] && split="$split $main-dev" 5.20 split="$(echo $split | tr ' ' '\n' | sort -u)" 5.21 @@ -1147,7 +1147,7 @@ 5.22 wok/*) page="${arg#wok/}"; page="$base/$pkg/browse/${page#*/}";; 5.23 *) page="$base/$pkg/browse/install/usr/share/$cmd/$arg";; 5.24 esac 5.25 - # make the iframe height so long to contain it's content without scrollbar 5.26 + # make the iframe height so long to contain its content without scrollbar 5.27 echo "<iframe id='idoc' src='$page' width='100%' onload='resizeIframe(this)'></iframe>" 5.28 ;; 5.29 *.pdf)