aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Ouellette <oue.paul18@gmail.com>2019-08-22 14:41:36 -0400
committerPaul Ouellette <oue.paul18@gmail.com>2019-08-22 14:41:36 -0400
commit8e602d751e79c97eb664682b5b2441495d9ad974 (patch)
tree49066f737f68d727e9f89244a588708ce3541251
parent5f35b21824fa4ec4670e5b98020533bedc147a82 (diff)
downloadluarocks-8e602d751e79c97eb664682b5b2441495d9ad974.tar.gz
luarocks-8e602d751e79c97eb664682b5b2441495d9ad974.tar.bz2
luarocks-8e602d751e79c97eb664682b5b2441495d9ad974.zip
Rewrap some help messages to 80 cols
-rw-r--r--src/luarocks/cmd/make.lua17
-rw-r--r--src/luarocks/cmd/new_version.lua34
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
44function make.add_to_parser(parser) 44function make.add_to_parser(parser)
45 local cmd = parser:command("make", [[ 45 local cmd = parser:command("make", [[
46Builds sources in the current directory, but unlike "build", 46Builds sources in the current directory, but unlike "build", it does not fetch
47it does not fetch sources, etc., assuming everything is 47sources, etc., assuming everything is available in the current directory. If no
48available in the current directory. If no argument is given, 48argument is given, it looks for a rockspec in the current directory and in
49it looks for a rockspec in the current directory and in "rockspec/" 49"rockspec/" and "rockspecs/" subdirectories, picking the rockspec with newest
50and "rockspecs/" subdirectories, picking the rockspec with newest version 50version or without version name. If rockspecs for different rocks are found or
51or without version name. If rockspecs for different rocks are found 51there are several rockspecs without version, you must specify which to use,
52or there are several rockspecs without version, you must specify which to use,
53through the command-line. 52through the command-line.
54 53
55This command is useful as a tool for debugging rockspecs. 54This command is useful as a tool for debugging rockspecs.
56To install rocks, you'll normally want to use the "install" and 55To install rocks, you'll normally want to use the "install" and "build"
57"build" commands. See the help on those for details. 56commands. See the help on those for details.
58 57
59NB: Use `luarocks install` with the `--only-deps` flag if you want to install 58NB: Use `luarocks install` with the `--only-deps` flag if you want to install
60only dependencies of the rockspec (see `luarocks help install`). 59only 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
14function new_version.add_to_parser(parser) 14function new_version.add_to_parser(parser)
15 local cmd = parser:command("new_version", [[ 15 local cmd = parser:command("new_version", [[
16This is a utility function that writes a new rockspec, updating data 16This is a utility function that writes a new rockspec, updating data from a
17from a previous one. 17previous one.
18 18
19If a package name is given, it downloads the latest rockspec from the 19If a package name is given, it downloads the latest rockspec from the default
20default server. If a rockspec is given, it uses it instead. If no argument 20server. If a rockspec is given, it uses it instead. If no argument is given, it
21is given, it looks for a rockspec same way 'luarocks make' does. 21looks for a rockspec same way 'luarocks make' does.
22 22
23If the version number is not given and tag is passed using --tag, 23If the version number is not given and tag is passed using --tag, it is used as
24it is used as the version, with 'v' removed from beginning. 24the version, with 'v' removed from beginning. Otherwise, it only increments the
25Otherwise, it only increments the revision number of the given 25revision number of the given (or downloaded) rockspec.
26(or downloaded) rockspec.
27 26
28If a URL is given, it replaces the one from the old rockspec with the 27If a URL is given, it replaces the one from the old rockspec with the given URL.
29given URL. If a URL is not given and a new version is given, it tries 28If a URL is not given and a new version is given, it tries to guess the new URL
30to guess the new URL by replacing occurrences of the version number 29by replacing occurrences of the version number in the URL or tag. It also tries
31in the URL or tag. It also tries to download the new URL to determine 30to download the new URL to determine the new MD5 checksum.
32the new MD5 checksum.
33 31
34If a tag is given, it replaces the one from the old rockspec. If there is 32If a tag is given, it replaces the one from the old rockspec. If there is an old
35an old tag but no new one passed, it is guessed in the same way URL is. 33tag but no new one passed, it is guessed in the same way URL is.
36 34
37If a directory is not given, it defaults to the current directory. 35If a directory is not given, it defaults to the current directory.
38 36
39WARNING: it writes the new rockspec to the given directory, 37WARNING: it writes the new rockspec to the given directory, overwriting the file
40overwriting the file if it already exists.]], util.see_also()) 38if 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)