bin/i2cssh in i2cssh-1.7.0 vs bin/i2cssh in i2cssh-1.7.1

@@ -17,12 +17,12 @@
     cluster = @clusters[c]
 
     if cluster
         set_options(cluster, login_from_cli)
 
-        if @i2_options[:login_override] then
-            @servers += cluster["hosts"].map{|h| "#{@i2_options[:login_override]}@#{h}"}
+        if @i2_options[:login] then
+            @servers += cluster["hosts"].map{|h| "#{@i2_options[:login]}@#{h}"}
         else
             @servers += cluster["hosts"]
         end
     else
         puts "ERROR: unknown cluster #{c}. Check your #{@config_file}"
@@ -34,15 +34,15 @@
     if config_hash["columns"] and config_hash["rows"] then
         puts "CONFIG ERROR: rows and columns can't be used a the same time"
         exit 1
     end
 
-    [:broadcast, :profile, :rank, :iterm2, :login_override, :columns, :rows, :sleep, :direction].each do |p|
+    [:broadcast, :profile, :rank, :iterm2, :login, :columns, :rows, :sleep, :direction].each do |p|
         @i2_options[p] = config_hash[p.to_s].nil? ? @i2_options[p] : config_hash[p.to_s]
     end
 
-    @i2_options[:login_override] = login_override if login_override
+    @i2_options[:login] = login_override if login_override
     @i2_options[:direction] ||= :column
     @i2_options[:direction] = @i2_options[:direction].to_sym
 
     @ssh_environment.merge!(config_hash["environment"].inject({}){|m, v| m.merge(v)}) if config_hash["environment"]
 end
@@ -88,11 +88,11 @@
         'Enable SSH agent forwarding' do
         ssh_options << '-A'
     end
     opts.on '-l', '--login LOGIN',
         'SSH login name' do |u|
-        opts_from_cmdline[:login_override] = u
+        opts_from_cmdline[:login] = u
         
     end
     opts.on '-e', '--environment KEY=VAL',
         'Send environment vars (comma-separated list, need to start with LC_)' do |e|
         @ssh_environment = e.split(",").inject({}) {|m, x| key, val = x.split("="); m[key] = val; m}
@@ -172,11 +172,11 @@
     @servers = ARGV
 end
 
 @i2_options.merge!(opts_from_cmdline)
 
-if @i2_options[:login_override] then
-    @servers = @servers.map{|h| "#{@i2_options[:login_override]}@#{h.gsub(/.+@/,'')}"}
+if @i2_options[:login] then
+    @servers = @servers.map{|h| "#{@i2_options[:login]}@#{h.gsub(/.+@/,'')}"}
 end
 
 if @servers.empty?
     puts "ERROR: no servers given"
     puts optparse.help