diff options
| -rw-r--r-- | lib/highline/terminal.rb | 2 | ||||
| -rw-r--r-- | lib/highline/terminal/unix_stty.rb | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/lib/highline/terminal.rb b/lib/highline/terminal.rb index 550c0c7..bfa0d08 100644 --- a/lib/highline/terminal.rb +++ b/lib/highline/terminal.rb @@ -176,7 +176,7 @@ class HighLine # Saves terminal state using shell stty command. def save_stty @stty_save = begin - `stty -g`.chomp + `stty -g`.chomp if input.tty? rescue StandardError nil end diff --git a/lib/highline/terminal/unix_stty.rb b/lib/highline/terminal/unix_stty.rb index ad9c85d..df1460b 100644 --- a/lib/highline/terminal/unix_stty.rb +++ b/lib/highline/terminal/unix_stty.rb @@ -20,7 +20,9 @@ class HighLine rescue LoadError end - if /solaris/ =~ RUBY_PLATFORM && + if !@output.tty? + [80, 24] + elsif /solaris/ =~ RUBY_PLATFORM && `stty` =~ /\brows = (\d+).*\bcolumns = (\d+)/ [Regexp.last_match(2), Regexp.last_match(1)].map(&:to_i) elsif `stty size` =~ /^(\d+)\s(\d+)$/ @@ -32,13 +34,13 @@ class HighLine # (see Terminal#raw_no_echo_mode) def raw_no_echo_mode - @state = `stty -g` - system "stty raw -echo -icanon isig" + save_stty + system "stty raw -echo -icanon isig" if input.tty? end # (see Terminal#restore_mode) def restore_mode - system "stty #{@state}" + restore_stty print "\r" end |