Merge remote-tracking branch 'github/master'

1 files changed, 3 insertions, 2 deletions

diff --git a/bin/trocla b/bin/trocla
index 39b9e76..a4f51cc 100755
--- a/bin/trocla
+++ b/bin/trocla
@@ -64,10 +64,11 @@ def set(options)
   else
     password = options.delete(:password) || STDIN.read.chomp
   end
+  format = options.delete(:trocla_format)
   Trocla.new(options.delete(:config_file)).set_password(
     options.delete(:trocla_key),
-    options.delete(:trocla_format),
-    password
+    format,
+    Trocla::Formats[format].format(password, options.delete(:other_options).shift.to_s)
   )
   ""
 end