From b17611f2db91ab3949197e453cf69e13c94b4a27 Mon Sep 17 00:00:00 2001 From: Jens Maier Date: Tue, 29 Jul 2014 22:53:41 +0200 Subject: [PATCH] Fix: defaults should be defaults and not override parsed settings. --- script/import_scripts/smf2.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/script/import_scripts/smf2.rb b/script/import_scripts/smf2.rb index 37994719c59..d2c41fd163e 100644 --- a/script/import_scripts/smf2.rb +++ b/script/import_scripts/smf2.rb @@ -405,12 +405,6 @@ class ImportScripts::Smf2 < ImportScripts::Base class Error < StandardError ; end class SettingsError < Error ; end - def initialize - self.host = 'localhost' - self.username = Etc.getlogin - self.prefix = 'smf_' - end - def parse!(args = ARGV) raise Error, 'not enough arguments' if ARGV.empty? begin @@ -421,6 +415,10 @@ class ImportScripts::Smf2 < ImportScripts::Base raise Error, 'too many arguments' if args.length > 1 self.smfroot = args.first read_smf_settings if self.smfroot + + self.host ||= 'localhost' + self.username ||= Etc.getlogin + self.prefix ||= 'smf_' end def usage