SliTaz Repositories

     1.1 --- a/cook	Mon Oct 30 00:44:20 2017 +0200
     1.2 +++ b/cook	Mon Oct 30 18:41:22 2017 +0000
     1.3 @@ -839,7 +839,7 @@
     1.4  		newline
     1.5  		_n 'Try again? [Y/n] '; read answer
     1.6  		[ "$answer" == 'n' ] && break
     1.7 -		# here you may append log if you want (">>" insted of last ">")
     1.8 +		# here you may append log if you want (">>" instead of last ">")
     1.9  		cookit $@ 2>&1 | loglimit 50 > $LOGS/$pkg.log
    1.10  	done
    1.11  
    1.12 @@ -1405,7 +1405,7 @@
    1.13  }
    1.14  
    1.15  
    1.16 -# Remove from current $fs files that already packed (for receipts v2).
    1.17 +# Remove from current $fs files that are already packed (for receipts v2).
    1.18  # Note: the order in $SPLIT is very important.
    1.19  
    1.20  remove_already_packed() {

     2.1 --- a/doc/receipts-v2.md	Mon Oct 30 00:44:20 2017 +0200
     2.2 +++ b/doc/receipts-v2.md	Mon Oct 30 18:41:22 2017 +0000
     2.3 @@ -38,22 +38,22 @@
     2.4  
     2.5    * use the `copy()` function or other methods to copy specified files from
     2.6      $install to $fs.
     2.7 -  * define the DEPENDS variable for specified package; you may omit this
     2.8 +  * define the DEPENDS variable for specified packages; you may omit this
     2.9      definition, then it will mean the following:
    2.10      * for the *main package*: it doesn't depend on any package;
    2.11 -    * for the *split packages*: it depends exclusively on *main package*.
    2.12 -    Note, receipt is the shell script with all its restrictions: there's no
    2.13 -    difference if you define empty DEPENDS variable or not define it at all.
    2.14 -    Here's the small trick: if you really want to define empty dependency,
    2.15 -    put single space between the quotes: `DEPENDS=" "`.
    2.16 +    * for the *split packages*: it depends exclusively on a *main package*.
    2.17 +    Note, a receipt is the shell script with all its restrictions: there's no
    2.18 +    difference if you define an empty DEPENDS variable or do not define it at all.
    2.19 +    Here's the small trick: if you really want to define empty dependencies,
    2.20 +    put single spaces between the quotes: `DEPENDS=" "`.
    2.21    * define the two-in-one CAT variable for *split packages*. Variable format:
    2.22 -
    2.23 + 
    2.24      ```bash
    2.25      CAT="category|addition"
    2.26      ```
    2.27  
    2.28 -    Where `category` is just the choosed category for the specified *split
    2.29 -    package*. And `addition` you will find in the brackets at the end of
    2.30 +    Where `category` is just the chosen category for the specified *split
    2.31 +    package*. And `addition` you will find in the brackets at the end of a
    2.32      short description of the specified *split package*. You may omit this
    2.33      definition for the "dev" packages. In this case it will be implicitly
    2.34      defined as:
    2.35 @@ -67,8 +67,8 @@
    2.36  Long descriptions
    2.37  -----------------
    2.38  
    2.39 -You may provide `description.txt` for the *main package* and/or
    2.40 -`description.package-name.txt` for any of the *split package*.
    2.41 +You may provide a `description.txt` for the *main package* and/or
    2.42 +`description.package-name.txt` for any of the *split packages*.
    2.43  
    2.44  
    2.45  `post_install()` and friends
    2.46 @@ -81,9 +81,9 @@
    2.47    * `pre_remove()`;
    2.48    * `post_remove()`.
    2.49  
    2.50 -These functions may be defined for every of *main* or *split package*, so
    2.51 -you need to extend function name with underscore (`_`) and the package name.
    2.52 -Like this for `cookutils` package:
    2.53 +These functions may be defined for every one of *main* or *split packages*, so
    2.54 +you need to extend function names with underscores (`_`) and the package name.
    2.55 +Like this for the `cookutils` package:
    2.56  
    2.57      post_install_cookutils()
    2.58  
    2.59 @@ -109,7 +109,7 @@
    2.60    * `@std`    - all the "standard" files;
    2.61    * `@dev`    - all the "developer" files;
    2.62    * `folder/` - append folder name in question by slash;
    2.63 -  * `file`    - file name without the slash in the end.
    2.64 +  * `file`    - file name without the slash at the end.
    2.65  
    2.66  Both patterns `@std` and `@dev` are meta-patterns making the most common actions
    2.67  extremely simple. Here all files are divided into three types: standard,
    2.68 @@ -120,7 +120,7 @@
    2.69  In the `folder/` and `file` forms of the patterns you can use the asterisk (`*`)
    2.70  symbol meaning any number of any characters.
    2.71  
    2.72 -Some examples (executed on the chroot with the "busybox" package installed):
    2.73 +Some examples (executed in the chroot with the "busybox" package installed):
    2.74  
    2.75    Pattern  | Result
    2.76  -----------|--------------------------------------------------------------------
    2.77 @@ -140,8 +140,8 @@
    2.78  
    2.79  ### Some more examples of using `copy()`
    2.80  
    2.81 -If your package used only for development purposes (like automake, flex, vala
    2.82 -and some other), you may use the next commant to put all the files you want
    2.83 +If your packages are used only for development purposes (like automake, flex, vala
    2.84 +and some others), you may use the next command to put all the files you want
    2.85  to pack into one package:
    2.86  
    2.87  ```bash
    2.88 @@ -170,11 +170,11 @@
    2.89  
    2.90  In the following example, a package can contain libraries (which can be used by
    2.91  other programs) and executables that use these libraries. We need to split
    2.92 -`@std` into two parts: libraries and executable files. This can be done in few
    2.93 +`@std` into two parts: libraries and executable files. This can be done in a few
    2.94  ways.
    2.95  
    2.96  ```bash
    2.97 -PACKAGE="my-pkg"
    2.98 +PACKAGE="my-pkg" 
    2.99  # We omit "my-pkg" in the $SPLIT, then it is implicit in the first place
   2.100  SPLIT="my-pkg-bin my-pkg-dev"
   2.101  genpkg_rules() {
   2.102 @@ -187,7 +187,7 @@
   2.103  ```
   2.104  
   2.105  ```bash
   2.106 -# If package contains some more files outside the /bin/ (for example, configs),
   2.107 +# If a package contains some more files outside of the /bin/ (for example, configs),
   2.108  # that we want to pack with the "bin" package:
   2.109  PACKAGE="my-pkg"
   2.110  SPLIT="my-pkg-bin my-pkg-dev"
   2.111 @@ -202,10 +202,10 @@
   2.112  ```
   2.113  
   2.114  ```bash
   2.115 -# Pack two different libraries into two packages, and the rest into third
   2.116 +# Pack two different libraries into two packages, and the rest into a third
   2.117  # package:
   2.118  PACKAGE="my-pkg"
   2.119 -# We explicitly specified all the packages, therefore they will be processed
   2.120 +# We explicitly specify all the packages, therefore they will be processed
   2.121  # in the specified order
   2.122  SPLIT="my-pkg-lib1 my-pkg-lib2 my-pkg my-pkg-dev"
   2.123  genpkg_rules() {