11:01 p.m.
This series first fixes a bug where gitano-setup wouldn't
read all the answer files it was given; and then it adds
support for a file name of '-' which is taken to mean stdin
and forces batch mode if it's used.
Daniel Silverstone (2):
fixes gitano-setup to read all answer files
adds support for '-' as stdin for gitano-setup
bin/gitano-setup.in | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
--
2.1.4
11:01 p.m.
New subject: [PATCH 1/2] fixes gitano-setup to read all answer files
Ensure that when we loop through the answer files, we actually
read all of them, not just the first.
---
bin/gitano-setup.in | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/bin/gitano-setup.in b/bin/gitano-setup.in
index 8363730..9e6bfaa 100644
--- a/bin/gitano-setup.in
+++ b/bin/gitano-setup.in
@@ -61,9 +61,11 @@ gitano.log.set_prefix("gitano-setup")
gitano.log.bump_level(gitano.log.level.CHAT)
for i = #possible_answers, 1, -1 do
- gitano.log.debug(gitano.i18n.expand("SETUP_DEBUG_PARSING_ANSWERS", {
file=possible_answers[1] }))
- local one_conf = assert(clod.parse(assert(io.open(possible_answers[1],
"r")):read "*a",
- "@" .. possible_answers[1]))
+ local answer_file = possible_answers[i]
+ gitano.log.debug(gitano.i18n.expand("SETUP_DEBUG_PARSING_ANSWERS", {
file=answer_file }))
+ local file_content = assert(io.open(answer_file, "r")):read "*a"
+ local file_name = "@" .. answer_file
+ local one_conf = assert(clod.parse(file_content, file_name))
gitano.log.debug(gitano.i18n.expand("SETUP_DEBUG_COMBINE_ANSWERS"))
for k,v in one_conf:each() do
gitano.log.ddebug(tostring(k) .. " = " .. tostring(v))
--
2.1.4
11:01 p.m.
New subject: [PATCH 2/2] adds support for '-' as stdin for gitano-setup
---
bin/gitano-setup.in | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/bin/gitano-setup.in b/bin/gitano-setup.in
index 9e6bfaa..86b2e08 100644
--- a/bin/gitano-setup.in
+++ b/bin/gitano-setup.in
@@ -60,11 +60,19 @@ local conf = clod.parse("")
gitano.log.set_prefix("gitano-setup")
gitano.log.bump_level(gitano.log.level.CHAT)
+local force_batch = false
for i = #possible_answers, 1, -1 do
local answer_file = possible_answers[i]
gitano.log.debug(gitano.i18n.expand("SETUP_DEBUG_PARSING_ANSWERS", {
file=answer_file }))
- local file_content = assert(io.open(answer_file, "r")):read "*a"
- local file_name = "@" .. answer_file
+ local file_content, file_name
+ if answer_file == "-" then
+ file_content = io.stdin:read "*a"
+ file_name = "@stdin"
+ force_batch = true
+ else
+ file_content = assert(io.open(answer_file, "r")):read "*a"
+ file_name = "@" .. answer_file
+ end
local one_conf = assert(clod.parse(file_content, file_name))
gitano.log.debug(gitano.i18n.expand("SETUP_DEBUG_COMBINE_ANSWERS"))
for k,v in one_conf:each() do
@@ -73,6 +81,10 @@ for i = #possible_answers, 1, -1 do
end
end
+if force_batch then
+ conf.settings["setup.batch"] = true
+end
+
gitano.log.chat(gitano.i18n.expand("SETUP_WELCOME"))
gitano.log.chat(gitano.i18n.expand("SETUP_DO_CHECKS"))
--
2.1.4
11:14 p.m.
On Sat, Apr 08, 2017 at 15:01:35 +0100, Daniel Silverstone wrote:
This series first fixes a bug where gitano-setup wouldn't
read all the answer files it was given; and then it adds
support for a file name of '-' which is taken to mean stdin
and forces batch mode if it's used.
I forgot to say:
Repo: https://git.gitano.org.uk/gitano.git
Ref: dsilvers/gitano-setup-tweaks
sha1: 26666f0c001a4807d5bb9de981211c1d3dc984aa
D.
--
Daniel Silverstone http://www.digital-scurf.org/
PGP mail accepted and encouraged. Key Id: 3CCE BABE 206C 3B69
11:51 p.m.
On Sat, Apr 08, 2017 at 03:01:35PM +0100, Daniel Silverstone wrote:
This series first fixes a bug where gitano-setup wouldn't
read all the answer files it was given; and then it adds
support for a file name of '-' which is taken to mean stdin
and forces batch mode if it's used.
Excellent! This caused me some problems when I was writing documentation.
I understand the logic in stdin implying it has to be batch mode,
since it then can't ask questions from stdin.
I might potentially prefer that if any answers file is provided
that it should imply batch mode, but I can see counter-arguments,
and it's a topic for another time.
Thanks for the patch. I have merged it.
2370
days inactive
2370
days old
4 comments
2 participants
participants (2)
-
Daniel Silverstone -
Richard Maw