From 42b0cfe90d9e6565557e13d304b568c89706f7d7 Mon Sep 17 00:00:00 2001 From: blacknon Date: Sun, 11 Aug 2024 01:56:34 +0900 Subject: [PATCH 1/2] update. debug. Fixed a bug where keys in Server config were not inherited when they were of int type. --- cmd/lscp/args.go | 2 +- cmd/lsftp/args.go | 2 +- cmd/lssh/args.go | 2 +- common/common.go | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/cmd/lscp/args.go b/cmd/lscp/args.go index e2271259..3d7a5cfc 100644 --- a/cmd/lscp/args.go +++ b/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(blacknon@orebibou.com)" - app.Version = "0.6.10" + app.Version = "0.6.11" // options // TODO(blacknon): オプションの追加(0.7.0) diff --git a/cmd/lsftp/args.go b/cmd/lsftp/args.go index 9e2742d6..fff8ac3f 100644 --- a/cmd/lsftp/args.go +++ b/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(blacknon@orebibou.com)" - 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"}, diff --git a/cmd/lssh/args.go b/cmd/lssh/args.go index 5f56ee19..07eb7c27 100644 --- a/cmd/lssh/args.go +++ b/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(blacknon@orebibou.com)" - app.Version = "0.6.10" + app.Version = "0.6.11" // TODO(blacknon): オプションの追加 // -m ... NFSマウントで、リモートホストの特定ディレクトリをローカルにマウント可能にする (v0.7.0) diff --git a/common/common.go b/common/common.go index eecfde69..82d742e7 100644 --- a/common/common.go +++ b/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 + } } } From 47f203d53ee84762a1ede6c266afad6b99daaa51 Mon Sep 17 00:00:00 2001 From: blacknon Date: Sun, 11 Aug 2024 11:05:51 +0900 Subject: [PATCH 2/2] update. comment --- cmd/lssh/args.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/lssh/args.go b/cmd/lssh/args.go index 07eb7c27..4254d828 100644 --- a/cmd/lssh/args.go +++ b/cmd/lssh/args.go @@ -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."},