Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Better Windows support & support for multiple fallback files #57

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Better Windows support & support for multiple fallback files #57

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a60c7e5
support multiple files; fallback resovling; fix typos
Feb 25, 2023
9f3cc37
comment improvements
Feb 25, 2023
44e2138
fixed include tests
Feb 25, 2023
ab34d8c
remove special char from filename; restore position of import
Feb 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
366 changes: 177 additions & 189 deletions config.go
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions config_!linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
//go:build !linux
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use a different filename?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure thing; the "exclamation mark" seems stupid now that i am seeing it the second time. :D

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had a look into this.

Looking at the GO reference : https://pkg.go.dev/cmd/go#hdr-Build_constraints
It seems that the xxx_!linux.go notation for files goes hand in hand with the //go:build !linux compile header.

There shouldn't be any difference between build contraints in file names and compile header.

It still is possible to rename the file with the drawback to handle all the different OSes in runtime.
And being unable to provide any os-spedific functions like SystemConfigFileFinder (in case of linux)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I updated to filename to one without the special char; the //go:build !linux compile header takes care of the build constraint.


package ssh_config

var DefaultConfigFileFinders = []ConfigFileFinder{UserHomeConfigFileFinder}
10 changes: 10 additions & 0 deletions config_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package ssh_config

import "path/filepath"

// SystemConfigFileFinder return ~/etc/ssh/ssh_config on linux os,
func SystemConfigFileFinder() (string, error) {
return filepath.Join("/", "etc", "ssh", "ssh_config"), nil
}

var DefaultConfigFileFinders = []ConfigFileFinder{UserHomeConfigFileFinder, SystemConfigFileFinder}
Loading