1 files changed, 2 insertions, 9 deletions
diff --git a/bin/trocla b/bin/trocla
index ccceb51..ac7389f 100755
--- a/bin/trocla
+++ b/bin/trocla
@@ -31,16 +31,11 @@ OptionParser.new do |opts|
     options['length'] = v.to_i
   end
 
-  opts.on("--password PASSWORD", "-p", "Provide password at command line") do |pass|
+  opts.on("--password [PASSWORD]", "-p", "Provide password at command line") do |pass|
     options[:ask_password] = false
     options[:password] = pass
   end
 
-  opts.on("--pwd-from-stdin") do
-    options[:ask_password] = false
-  end
-
-
 end.parse!
 
 def create(options)
@@ -70,9 +65,7 @@ def set(options)
       exit 1
     end
   else
-    # FIXME: I don't know if we have to delete other options here.
-    password = options.delete(:password)
-    password = STDIN.read if not password
+    password = options.delete(:password) || STDIN.read.chomp
   end
   Trocla.new(options.delete(:config_file)).set_password(
     options.delete(:trocla_key),