aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-01-03 03:36:40 +0000
committerMatthew Wild <mwild1@gmail.com>2010-01-03 03:36:40 +0000
commit67509f371ad0116a6c13b6f715d9bd3f769e6807 (patch)
tree6a9e26f849a082a8429e89800ec03c874cef3a8a
parent7439c858d52879156f76f073d9dc705c3f70d57d (diff)
downloadprosody-67509f371ad0116a6c13b6f715d9bd3f769e6807.tar.gz
prosody-67509f371ad0116a6c13b6f715d9bd3f769e6807.zip
prosodyctl: Gracefully handle a missing stty command, and fall back to ANSI escape sequences
-rwxr-xr-xprosodyctl25
1 files changed, 20 insertions, 5 deletions
diff --git a/prosodyctl b/prosodyctl
index 522ebde9..a44dfada 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -137,18 +137,33 @@ function show_usage(usage, desc)
end
local function getchar(n)
- os.execute("stty raw -echo");
- local ok, char = pcall(io.read, n or 1);
- os.execute("stty sane");
+ local stty_ret = os.execute("stty raw -echo 2>/dev/null");
+ local ok, char;
+ if stty_ret == 0 then
+ ok, char = pcall(io.read, n or 1);
+ os.execute("stty sane");
+ else
+ ok, char = pcall(io.read, "*l");
+ if ok then
+ char = char:sub(1, n or 1);
+ end
+ end
if ok then
return char;
end
end
local function getpass()
- os.execute("stty -echo");
+ local stty_ret = os.execute("stty -echo 2>/dev/null");
+ if stty_ret ~= 0 then
+ io.write("\027[08m"); -- ANSI 'hidden' text attribute
+ end
local ok, pass = pcall(io.read, "*l");
- os.execute("stty sane");
+ if stty_ret == 0 then
+ os.execute("stty sane");
+ else
+ io.write("\027[00m");
+ end
io.write("\n");
if ok then
return pass;