Merge remote-tracking branch 'origin/dsilvers/gitano-setup-tweaks'

1 files changed, 17 insertions, 3 deletions

diff --git a/bin/gitano-setup.in b/bin/gitano-setup.in
index 8363730..86b2e08 100644
--- a/bin/gitano-setup.in
+++ b/bin/gitano-setup.in
@@ -60,10 +60,20 @@ 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
-   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, 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
       gitano.log.ddebug(tostring(k) .. " = " .. tostring(v))
@@ -71,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"))