Fix updating htpasswd files

This would previously break because if it's updating htpasswd
it passes an empty argument rather than no argument.

Rather than stop it passing the empty argument
this patch instead passes -i flags unconditionally
and merges the flags argument.

This is to make it use the batch-input code-path
which doesn't attempt to use a tty for its input,
since it caused issues in the test suite
which fakes the server.

This requires changing it to only pass the password as input once.

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/gitano/usercommand.lua b/lib/gitano/usercommand.lua
index e33921a..f9ddf1d 100644
--- a/lib/gitano/usercommand.lua
+++ b/lib/gitano/usercommand.lua
@@ -255,13 +255,13 @@ end
 
 local function update_htpasswd(user, passwd)
    local htpasswd_path = os.getenv("HOME") .. "/htpasswd"
-   local flags = io.open(htpasswd_path, "r") and "" or "-c"
+   local flags = io.open(htpasswd_path, "r") and "-i" or "-ic"
    local exit_code
 
    if passwd ~= '' then
       local proc = subprocess.spawn_simple({
          "htpasswd", flags, htpasswd_path, user,
-         stdin = passwd .. '\n' .. passwd .. '\n',
+         stdin = passwd,
          stdout = subprocess.PIPE,
          stderr = subprocess.PIPE
       })