cookutils rev 1104
Tiny edits
author | Paul Issott <paul@slitaz.org> |
---|---|
date | Sat Dec 01 10:13:45 2018 +0000 (2018-12-01) |
parents | 68d7bbd2b138 |
children | 4871abb4dc67 |
files | doc/cookopts.txt lighttpd/index.cgi modules/pack |
line diff
1.1 --- a/doc/cookopts.txt Sat Dec 01 11:36:38 2018 +0200 1.2 +++ b/doc/cookopts.txt Sat Dec 01 10:13:45 2018 +0000 1.3 @@ -184,14 +184,14 @@ 1.4 force-arch 1.5 Architecture of the package determined by examining executable files on 1.6 a packing stage. System with "i486" architecture may produce packages with 1.7 - architecture "i486" or "any" (if there's no architecture-dependent files 1.8 - like shared libraries or binaries were found, but only Shell, Python, Perl 1.9 + architecture "i486" or "any" (if there's no architecture-dependent no files 1.10 + like shared libraries or binaries are found, but only Shell, Python, Perl 1.11 scripts, fonts, icons, and so on). System with "x86_64" architecture may 1.12 produce packages with architecture "x86_64" or "any". 1.13 In rare cases architecture-independent packages built in "i486" and "x86_64" 1.14 environments may have architecture-dependent settings in configuration 1.15 - files. Or package may provide architecture-dependent paths (Perl modules 1.16 - packages) - this checking not implemented yet. Or package may contain some 1.17 - files for other architecture and you need to override default behavior. 1.18 + files or package may provide architecture-dependent paths (Perl modules 1.19 + packages) - this checking is not implemented yet or package may contain some 1.20 + files for another architecture and you need to override default behavior. 1.21 In all these cases you can use this option and architecture of all packages 1.22 - produced with this receipt will be the same as build environment has. 1.23 + produced with this receipt will be the same as the build environment.
2.1 --- a/lighttpd/index.cgi Sat Dec 01 11:36:38 2018 +0200 2.2 +++ b/lighttpd/index.cgi Sat Dec 01 10:13:45 2018 +0000 2.3 @@ -259,7 +259,7 @@ 2.4 # Problems: 2.5 # 1. Function "latest packaged version" widely used here and it has no JSON API, but only SVG badge. 2.6 # 2. So, all version comparisons can be only visual and not automated. 2.7 -# 3. If the thousands of badges present on the web page, many of them are broken (maybe server 2.8 +# 3. Of the thousands of badges present on the web page, many of them are broken (maybe server 2.9 # drops requests), while our server displays status icons well. 2.10 # 4. Default badges are wide and not customizable. 2.11 # Solution: 2.12 @@ -974,7 +974,7 @@ 2.13 ;; 2.14 libtool) 2.15 t="Libtool isn't fixed" 2.16 - p="This package use <code>libtool</code> that likes to add unnecessary dependencies to programs and libraries" 2.17 + p="This package uses <code>libtool</code> that likes to add unnecessary dependencies to programs and libraries" 2.18 s="Add the <code>fix libtool</code> command to the <a href=\"$base/$PACKAGE/receipt\">receipt</a> between the <code>configure</code> and <code>make</code> commands invocation" 2.19 ;; 2.20 nolibtool) 2.21 @@ -1009,7 +1009,7 @@ 2.22 ;; 2.23 ss) 2.24 t="Site script" 2.25 - p="This autotools-based building system use site script; most of paths (like <var>prefix</var>, <var>sysconfdir</var> and <var>mandir</var>) are defined there with correct default values" 2.26 + p="This autotools-based building system uses site script; most of paths (like <var>prefix</var>, <var>sysconfdir</var> and <var>mandir</var>) are defined there with correct default values" 2.27 s="You may remove your paths from <code>configure</code> invocation" 2.28 ;; 2.29 fadd) 2.30 @@ -1019,7 +1019,7 @@ 2.31 ;; 2.32 frem) 2.33 t="Files have been removed" 2.34 - p="Some files existing in <var>\$install</var> <a href=\"$base/$PACKAGE/files#orphans\">not belong to any package</a>" 2.35 + p="Some files existing in <var>\$install</var> <a href=\"$base/$PACKAGE/files#orphans\">do not belong to any package</a>" 2.36 s="Revise <code>genpkg_rules()</code> or add files to “<a href=\"$base/$PACKAGE/stuff/overrides\">overrides</a>” list" 2.37 ;; 2.38 fdup) 2.39 @@ -1374,7 +1374,7 @@ 2.40 <h2>For maintainers</h2> 2.41 <p>Here you can <a href="=/">explore the badges</a>.</p> 2.42 <p>Or see some <a href="?maintainer&stats">repository statistics</a>.</p> 2.43 - <p>Or check packages version either for specified maintainer or using regular expression:</p> 2.44 + <p>Or check packages version either for specified maintainer or using regular expressions:</p> 2.45 <form> 2.46 <select name="maintainer"> 2.47 <option value=''>--- select maintainer ---
3.1 --- a/modules/pack Sat Dec 01 11:36:38 2018 +0200 3.2 +++ b/modules/pack Sat Dec 01 10:13:45 2018 +0000 3.3 @@ -247,20 +247,20 @@ 3.4 3.5 # 1. Main package. 3.6 # By default it has no dependencies. 3.7 - # You can write or omit DEPENDS="" for indicating package have no 3.8 + # You can write or omit DEPENDS="" for indicating packages that have no 3.9 # dependencies. 3.10 # 2. Split package (excluding *-dev). 3.11 # By default every split package depends on the main package. 3.12 # Unfortunately, in the shell script (receipt is the shell script too), 3.13 - # every undeclared variable has empty value, so there's no difference if 3.14 + # every undeclared variable has an empty value, so there's no difference if 3.15 # you wrote DEPENDS="" or omit it - result will be the same empty value. 3.16 - # If you want to define the split package has no dependencies - you need 3.17 - # to to put single space between the quotes: DEPENDS=" ". 3.18 + # If you want to define that the split package has no dependencies - you need 3.19 + # to to put a single space between the quotes: DEPENDS=" ". 3.20 # 3. Development split package. 3.21 # Installing *-dev package should install all the files produced during 3.22 - # compilation and then were separated to the different packages, so 3.23 + # compilation and then were separated into the different packages, so 3.24 # by default (if you wrote DEPENDS="" or omit it) *-dev package depends 3.25 - # on the main package and all the split packages (excluding the itself). 3.26 + # on the main package and all the split packages (excluding itself). 3.27 [ "$DEPENDS" == ' ' ] && DEPENDS='@EMPTY@' 3.28 3.29 # Receipt's signature is important, although some receipts may miss it 3.30 @@ -642,7 +642,7 @@ 3.31 3.32 # Usually it does not change on "just recook". 3.33 # Md5sum of the *.tazpkg will change every time because of embedded timestamps; 3.34 - # on the other hand release checksum don't relies on the timestamps, but 3.35 + # on the other hand release checksums don't rely on the timestamps, but 3.36 # only on files content and their permissions. 3.37 3.38 # Calculate rsum for new package 3.39 @@ -726,9 +726,9 @@ 3.40 # Preferrable way is to combine the commands chain in the compile_rules() 3.41 # using '&&': when any of the chunk broke, process will stop and function 3.42 # will return non-zero return code. 3.43 - # On the other hand some old receipts don't use '&&' but depends on the 3.44 + # On the other hand some old receipts don't use '&&' but depend on the 3.45 # error messages on the log. 3.46 - # Sometimes it produce false positives on the configuration stage. 3.47 + # Sometimes it produce false positives in the configuration stage. 3.48 # In this case we can use the "skip-log-errors". 3.49 if [ "${COOKOPTS/skip-log-errors/}" == "$COOKOPTS" ]; then 3.50 # Exit if any error found in log file. 3.51 @@ -784,7 +784,7 @@ 3.52 3.53 # For example, if *-dev package contains *.a static libs, it will be either 3.54 # i486 or x86_64 arch; otherwise it will be "any" arch. This transition 3.55 - # may be done forth and back depending on you disable static libs or not. 3.56 + # may be done back and forth depending on if you disable static libs or not. 3.57 case $arch in 3.58 any) 3.59 if [ -e $PKGS/$PACKAGE-$VERSION$EXTRAVERSION-$ARCH.tazpkg ]; then 3.60 @@ -816,7 +816,7 @@ 3.61 rm -f "$PKGS/$old_file" 3.62 status 3.63 fi 3.64 - # package changed, substitute old package by new one 3.65 + # package changed, substitute old package for new one 3.66 mv -f $pkgdir/taz/$PACKAGE-$VERSION$EXTRAVERSION-$arch.tazpkg $PKGS 3.67 _ 'The release checksum has changed.' 3.68 else