instead of hard setting stty, restore previous value

daviddavis · Jun 25, 2012 · 039c665 · 039c665
1 parent 44bbee3
commit 039c665
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/puppet/bin/katello-configure b/puppet/bin/katello-configure
@@ -144,9 +144,10 @@ def _is_option_true(option_value)
 end
 
 def _read_password()
+    stty_orig_val = %x( stty -g )
 	system("stty -echo")
 	input = STDIN.gets
-	system("stty echo")
+	system("stty #{stty_orig_val}")
 	puts
 	return input
 end

diff --git a/puppet/bin/katello-passwd b/puppet/bin/katello-passwd
@@ -82,6 +82,7 @@ elsif ARGV.count > 0
 else
   # query method
   begin
+    stty_orig_val = %x( stty -g )
     system "stty -echo"
     print "Password: "; pass1 = $stdin.gets.chomp; puts "\n"
     print "Password (repeat): "; pass2 = $stdin.gets.chomp; puts "\n"
@@ -92,6 +93,6 @@ else
       exit 2
     end
   ensure
-    system "stty echo"
+    system("stty #{stty_orig_val}")
   end
 end