From 8e602d751e79c97eb664682b5b2441495d9ad974 Mon Sep 17 00:00:00 2001 From: Paul Ouellette Date: Thu, 22 Aug 2019 14:41:36 -0400 Subject: Rewrap some help messages to 80 cols --- src/luarocks/cmd/make.lua | 17 ++++++++--------- 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 function make.add_to_parser(parser) local cmd = parser:command("make", [[ -Builds sources in the current directory, but unlike "build", -it does not fetch sources, etc., assuming everything is -available in the current directory. If no argument is given, -it looks for a rockspec in the current directory and in "rockspec/" -and "rockspecs/" subdirectories, picking the rockspec with newest version -or without version name. If rockspecs for different rocks are found -or there are several rockspecs without version, you must specify which to use, +Builds sources in the current directory, but unlike "build", it does not fetch +sources, etc., assuming everything is available in the current directory. If no +argument is given, it looks for a rockspec in the current directory and in +"rockspec/" and "rockspecs/" subdirectories, picking the rockspec with newest +version or without version name. If rockspecs for different rocks are found or +there are several rockspecs without version, you must specify which to use, through the command-line. This command is useful as a tool for debugging rockspecs. -To install rocks, you'll normally want to use the "install" and -"build" commands. See the help on those for details. +To install rocks, you'll normally want to use the "install" and "build" +commands. See the help on those for details. NB: Use `luarocks install` with the `--only-deps` flag if you want to install 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") function new_version.add_to_parser(parser) local cmd = parser:command("new_version", [[ -This is a utility function that writes a new rockspec, updating data -from a previous one. +This is a utility function that writes a new rockspec, updating data from a +previous one. -If a package name is given, it downloads the latest rockspec from the -default server. If a rockspec is given, it uses it instead. If no argument -is given, it looks for a rockspec same way 'luarocks make' does. +If a package name is given, it downloads the latest rockspec from the default +server. If a rockspec is given, it uses it instead. If no argument is given, it +looks for a rockspec same way 'luarocks make' does. -If the version number is not given and tag is passed using --tag, -it is used as the version, with 'v' removed from beginning. -Otherwise, it only increments the revision number of the given -(or downloaded) rockspec. +If the version number is not given and tag is passed using --tag, it is used as +the version, with 'v' removed from beginning. Otherwise, it only increments the +revision number of the given (or downloaded) rockspec. -If a URL is given, it replaces the one from the old rockspec with the -given URL. If a URL is not given and a new version is given, it tries -to guess the new URL by replacing occurrences of the version number -in the URL or tag. It also tries to download the new URL to determine -the new MD5 checksum. +If a URL is given, it replaces the one from the old rockspec with the given URL. +If a URL is not given and a new version is given, it tries to guess the new URL +by replacing occurrences of the version number in the URL or tag. It also tries +to download the new URL to determine the new MD5 checksum. -If a tag is given, it replaces the one from the old rockspec. If there is -an old tag but no new one passed, it is guessed in the same way URL is. +If a tag is given, it replaces the one from the old rockspec. If there is an old +tag but no new one passed, it is guessed in the same way URL is. If a directory is not given, it defaults to the current directory. -WARNING: it writes the new rockspec to the given directory, -overwriting the file if it already exists.]], util.see_also()) +WARNING: it writes the new rockspec to the given directory, overwriting the file +if it already exists.]], util.see_also()) :summary("Auto-write a rockspec for a new version of a rock.") parser:command("new-version"):hidden(true):action(function(args) args.command = "new_version" end) -- cgit v1.2.3-55-g6feb