diff options
author | Paul Ouellette <oue.paul18@gmail.com> | 2019-08-22 14:41:36 -0400 |
---|---|---|
committer | Paul Ouellette <oue.paul18@gmail.com> | 2019-08-22 14:41:36 -0400 |
commit | 8e602d751e79c97eb664682b5b2441495d9ad974 (patch) | |
tree | 49066f737f68d727e9f89244a588708ce3541251 | |
parent | 5f35b21824fa4ec4670e5b98020533bedc147a82 (diff) | |
download | luarocks-8e602d751e79c97eb664682b5b2441495d9ad974.tar.gz luarocks-8e602d751e79c97eb664682b5b2441495d9ad974.tar.bz2 luarocks-8e602d751e79c97eb664682b5b2441495d9ad974.zip |
Rewrap some help messages to 80 cols
-rw-r--r-- | src/luarocks/cmd/make.lua | 17 | ||||
-rw-r--r-- | src/luarocks/cmd/new_version.lua | 34 |
2 files changed, 24 insertions, 27 deletions
diff --git a/src/luarocks/cmd/make.lua b/src/luarocks/cmd/make.lua index ef99218a..480ec48d 100644 --- a/src/luarocks/cmd/make.lua +++ b/src/luarocks/cmd/make.lua | |||
@@ -43,18 +43,17 @@ end | |||
43 | 43 | ||
44 | function make.add_to_parser(parser) | 44 | function make.add_to_parser(parser) |
45 | local cmd = parser:command("make", [[ | 45 | local cmd = parser:command("make", [[ |
46 | Builds sources in the current directory, but unlike "build", | 46 | Builds sources in the current directory, but unlike "build", it does not fetch |
47 | it does not fetch sources, etc., assuming everything is | 47 | sources, etc., assuming everything is available in the current directory. If no |
48 | available in the current directory. If no argument is given, | 48 | argument is given, it looks for a rockspec in the current directory and in |
49 | it looks for a rockspec in the current directory and in "rockspec/" | 49 | "rockspec/" and "rockspecs/" subdirectories, picking the rockspec with newest |
50 | and "rockspecs/" subdirectories, picking the rockspec with newest version | 50 | version or without version name. If rockspecs for different rocks are found or |
51 | or without version name. If rockspecs for different rocks are found | 51 | there are several rockspecs without version, you must specify which to use, |
52 | or there are several rockspecs without version, you must specify which to use, | ||
53 | through the command-line. | 52 | through the command-line. |
54 | 53 | ||
55 | This command is useful as a tool for debugging rockspecs. | 54 | This command is useful as a tool for debugging rockspecs. |
56 | To install rocks, you'll normally want to use the "install" and | 55 | To install rocks, you'll normally want to use the "install" and "build" |
57 | "build" commands. See the help on those for details. | 56 | commands. See the help on those for details. |
58 | 57 | ||
59 | NB: Use `luarocks install` with the `--only-deps` flag if you want to install | 58 | NB: Use `luarocks install` with the `--only-deps` flag if you want to install |
60 | only dependencies of the rockspec (see `luarocks help install`). | 59 | only dependencies of the rockspec (see `luarocks help install`). |
diff --git a/src/luarocks/cmd/new_version.lua b/src/luarocks/cmd/new_version.lua index 1aecec95..62fb08f6 100644 --- a/src/luarocks/cmd/new_version.lua +++ b/src/luarocks/cmd/new_version.lua | |||
@@ -13,31 +13,29 @@ local type_rockspec = require("luarocks.type.rockspec") | |||
13 | 13 | ||
14 | function new_version.add_to_parser(parser) | 14 | function new_version.add_to_parser(parser) |
15 | local cmd = parser:command("new_version", [[ | 15 | local cmd = parser:command("new_version", [[ |
16 | This is a utility function that writes a new rockspec, updating data | 16 | This is a utility function that writes a new rockspec, updating data from a |
17 | from a previous one. | 17 | previous one. |
18 | 18 | ||
19 | If a package name is given, it downloads the latest rockspec from the | 19 | If a package name is given, it downloads the latest rockspec from the default |
20 | default server. If a rockspec is given, it uses it instead. If no argument | 20 | server. If a rockspec is given, it uses it instead. If no argument is given, it |
21 | is given, it looks for a rockspec same way 'luarocks make' does. | 21 | looks for a rockspec same way 'luarocks make' does. |
22 | 22 | ||
23 | If the version number is not given and tag is passed using --tag, | 23 | If the version number is not given and tag is passed using --tag, it is used as |
24 | it is used as the version, with 'v' removed from beginning. | 24 | the version, with 'v' removed from beginning. Otherwise, it only increments the |
25 | Otherwise, it only increments the revision number of the given | 25 | revision number of the given (or downloaded) rockspec. |
26 | (or downloaded) rockspec. | ||
27 | 26 | ||
28 | If a URL is given, it replaces the one from the old rockspec with the | 27 | If a URL is given, it replaces the one from the old rockspec with the given URL. |
29 | given URL. If a URL is not given and a new version is given, it tries | 28 | If a URL is not given and a new version is given, it tries to guess the new URL |
30 | to guess the new URL by replacing occurrences of the version number | 29 | by replacing occurrences of the version number in the URL or tag. It also tries |
31 | in the URL or tag. It also tries to download the new URL to determine | 30 | to download the new URL to determine the new MD5 checksum. |
32 | the new MD5 checksum. | ||
33 | 31 | ||
34 | If a tag is given, it replaces the one from the old rockspec. If there is | 32 | If a tag is given, it replaces the one from the old rockspec. If there is an old |
35 | an old tag but no new one passed, it is guessed in the same way URL is. | 33 | tag but no new one passed, it is guessed in the same way URL is. |
36 | 34 | ||
37 | If a directory is not given, it defaults to the current directory. | 35 | If a directory is not given, it defaults to the current directory. |
38 | 36 | ||
39 | WARNING: it writes the new rockspec to the given directory, | 37 | WARNING: it writes the new rockspec to the given directory, overwriting the file |
40 | overwriting the file if it already exists.]], util.see_also()) | 38 | if it already exists.]], util.see_also()) |
41 | :summary("Auto-write a rockspec for a new version of a rock.") | 39 | :summary("Auto-write a rockspec for a new version of a rock.") |
42 | 40 | ||
43 | parser:command("new-version"):hidden(true):action(function(args) args.command = "new_version" end) | 41 | parser:command("new-version"):hidden(true):action(function(args) args.command = "new_version" end) |