summaryrefslogtreecommitdiff
path: root/bin/trocla
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2014-06-27 19:23:20 +0200
committermh <mh@immerda.ch>2014-06-27 19:23:20 +0200
commitecb2a2c7c6ec3576bc49747a484fa0f8e93a50fa (patch)
tree05ccf120e136b3d6d77a8d91f9930f0139b8e54b /bin/trocla
parent20de208ee827cb451e60705180909ce81eae0127 (diff)
parent08ac533d2156b666ae6ca68e797992629051315f (diff)
Merge branch 'tilya-charset_option'
Diffstat (limited to 'bin/trocla')
-rwxr-xr-xbin/trocla5
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/trocla b/bin/trocla
index dd32f84..6949318 100755
--- a/bin/trocla
+++ b/bin/trocla
@@ -65,10 +65,11 @@ def set(options)
password = options.delete(:password) || STDIN.read.chomp
end
format = options.delete(:trocla_format)
- Trocla.new(options.delete(:config_file)).set_password(
+ trocla = Trocla.new(options.delete(:config_file))
+ trocla.set_password(
options.delete(:trocla_key),
format,
- Trocla::Formats[format].format(password, options.delete(:other_options).shift.to_s)
+ trocla.formats(format).format(password, options.delete(:other_options).shift.to_s)
)
""
end