From 8cb9aa3566c73628e6878522cb9754b7ec687839 Mon Sep 17 00:00:00 2001 From: Shulhan Date: Tue, 26 Dec 2023 15:49:26 +0700 Subject: go.mod: update share module The update on share module fix several issues in "lib/ssh/config". Including, * Fix on SSH Config the default values. Using Host with different Port now working as expected. * Refactoring the Config merge. Using IdentityFile or UserKnownHostsFile with relative path in ".ssh/config", for example UserKnownHostsFile known_hosts will now load the known_hosts in the same directory as config file. --- awwan.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/awwan.go b/awwan.go index 99cfec9..94e1262 100644 --- a/awwan.go +++ b/awwan.go @@ -477,7 +477,7 @@ func (aww *Awwan) loadSSHConfig() (err error) { if baseDirConfig == nil { return nil } - aww.sshConfig.Prepend(baseDirConfig) + aww.sshConfig.Merge(baseDirConfig) return nil } diff --git a/go.mod b/go.mod index b19d88a..4e45e2a 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ go 1.20 require ( git.sr.ht/~shulhan/ciigo v0.11.0 github.com/evanw/esbuild v0.19.8 - github.com/shuLhan/share v0.51.1-0.20231222082140-8932e7ab20fc + github.com/shuLhan/share v0.51.1-0.20231225193715-bbefc9b4cd94 ) require ( diff --git a/go.sum b/go.sum index dd7350b..605b1b8 100644 --- a/go.sum +++ b/go.sum @@ -6,8 +6,8 @@ git.sr.ht/~shulhan/go-x-crypto v0.17.1-0.20231222080754-445dd75cd339 h1:iq2/NVwT git.sr.ht/~shulhan/go-x-crypto v0.17.1-0.20231222080754-445dd75cd339/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= github.com/shuLhan/esbuild v0.19.9-0.20231209212032-2dc984ffc5f1 h1:U4DRlREmugTNkevukauQjjUsz82o3YRjtbxDILoN/Xs= github.com/shuLhan/esbuild v0.19.9-0.20231209212032-2dc984ffc5f1/go.mod h1:D2vIQZqV/vIf/VRHtViaUtViZmG7o+kKmlBfVQuRi48= -github.com/shuLhan/share v0.51.1-0.20231222082140-8932e7ab20fc h1:S5i3VxbBTnEGeeUIl12EXrSzk5KHyUOGoUcFZqdBp4E= -github.com/shuLhan/share v0.51.1-0.20231222082140-8932e7ab20fc/go.mod h1:aNDs/SjnVYXaLEEJzjmfrUFeLD6u0YHWy6pI8o8iqYw= +github.com/shuLhan/share v0.51.1-0.20231225193715-bbefc9b4cd94 h1:0pI1VYz7sj4jMjfViyDy26qFUokHozq8CGEfrHnDGm4= +github.com/shuLhan/share v0.51.1-0.20231225193715-bbefc9b4cd94/go.mod h1:aNDs/SjnVYXaLEEJzjmfrUFeLD6u0YHWy6pI8o8iqYw= github.com/yuin/goldmark v1.6.0 h1:boZcn2GTjpsynOsC0iJHnBWa4Bi0qzfJjthwauItG68= github.com/yuin/goldmark v1.6.0/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yuin/goldmark-meta v1.1.0 h1:pWw+JLHGZe8Rk0EGsMVssiNb/AaPMHfSRszZeUeiOUc= -- cgit v1.3