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

Fix #671: updatekeys checks for config file flag #672

Merged
merged 5 commits into from May 8, 2020
Merged

Fix #671: updatekeys checks for config file flag #672

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
37e6e91
update 'updatekeys' subcommand to use config (if exists) from command…
May 7, 2020
2d10032
Fix #671: `updatekeys` checks for config file flag
May 7, 2020
3920d75
Fix #671: `updatekeys` checks for config file flag
May 7, 2020
c18582e
Fix #671: `updatekeys` checks for config file flag
May 8, 2020
87656bd
Update cmd/sops/main.go
autrilla May 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 10 additions & 3 deletions cmd/sops/main.go
View file
Open in desktop
Expand Up @@ -474,9 +474,16 @@ func main() {
},
}, keyserviceFlags...),
Action: func(c *cli.Context) error {
configPath, err := config.FindConfigFile(".")
if err != nil {
return common.NewExitError(err, codes.ErrorGeneric)
var err error
var configPath string
// Check if config is provided though the command line
autrilla marked this conversation as resolved.
Show resolved Hide resolved
if c.GlobalString("config") != "" {
configPath = c.GlobalString("config")
} else {
configPath, err = config.FindConfigFile(".")
if err != nil {
return common.NewExitError(err, codes.ErrorGeneric)
}
}
if c.NArg() < 1 {
return common.NewExitError("Error: no file specified", codes.NoFileSpecified)
Expand Down