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 logic of -o flag in generate config #1108

Merged
merged 1 commit into from
Feb 22, 2022
Merged

Fix logic of -o flag in generate config #1108

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 3 additions & 6 deletions cmd/skywire-cli/commands/config/gen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,18 +79,15 @@ var genConfigCmd = &cobra.Command{
logger.Fatal("Failed to create config: use of mutually exclusive flags")
}

//check -o --output flag set manually or not, if yes override package and skybian config flag
if cmd.Flags().Changed("output") {
packageConfig = false
}

//set output for package and skybian configs
if packageConfig {
configName := "skywire-visor.json"
if hypervisor {
configName = "skywire.json"
}
output = filepath.Join(skyenv.PackageSkywirePath(), configName)
if !cmd.Flags().Changed("output") {
output = filepath.Join(skyenv.PackageSkywirePath(), configName)
}
}

// Read in old config (if any) and obtain old secret key.
Expand Down