Merge pull request #141 from blacknon/develop

Version 0.6.11

cmd/lscp/args.go

@@ -58,7 +58,7 @@ USAGE:
 	app.Name = "lscp"
 	app.Usage = "TUI list select and parallel scp client command."
 	app.Copyright = "blacknon([email protected])"
-	app.Version = "0.6.10"
+	app.Version = "0.6.11"
 
 	// options
 	// TODO(blacknon): オプションの追加(0.7.0)

cmd/lsftp/args.go

@@ -50,7 +50,7 @@ USAGE:
 	app.Name = "lsftp"
 	app.Usage = "TUI list select and parallel sftp client command."
 	app.Copyright = "blacknon([email protected])"
-	app.Version = "0.6.10"
+	app.Version = "0.6.11"
 
 	app.Flags = []cli.Flag{
 		cli.StringFlag{Name: "file,F", Value: defConf, Usage: "config file path"},

cmd/lssh/args.go

@@ -59,7 +59,7 @@ USAGE:
 	app.Name = "lssh"
 	app.Usage = "TUI list select and parallel ssh client command."
 	app.Copyright = "blacknon([email protected])"
-	app.Version = "0.6.10"
+	app.Version = "0.6.11"
 
 	// TODO(blacknon): オプションの追加
 	//     -m       ... NFSマウントで、リモートホストの特定ディレクトリをローカルにマウント可能にする (v0.7.0)
@@ -79,7 +79,7 @@ USAGE:
 		cli.StringSliceFlag{Name: "host,H", Usage: "connect `servername`."},
 		cli.StringFlag{Name: "file,F", Value: defConf, Usage: "config `filepath`."},
 
-		// port forward option
+		// port forward (with dynamic forward) option
 		cli.StringSliceFlag{Name: "L", Usage: "Local port forward mode.Specify a `[bind_address:]port:remote_address:port`. Only single connection works."},
 		cli.StringSliceFlag{Name: "R", Usage: "Remote port forward mode.Specify a `[bind_address:]port:remote_address:port`. If only one port is specified, it will operate as Reverse Dynamic Forward. Only single connection works."},
 		cli.StringFlag{Name: "D", Usage: "Dynamic port forward mode(Socks5). Specify a `port`. Only single connection works."},

common/common.go

@@ -88,6 +88,11 @@ func MapReduce(map1, map2 map[string]interface{}) map[string]interface{} {
 			if value == true && map2Value.Bool() == false {
 				map2[ia] = value
 			}
+		case int:
+			map2Value := reflect.ValueOf(map2[ia])
+			if value != 0 && map2Value.Int() == 0 {
+				map2[ia] = value
+			}
 		}
 	}