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

Fix version check #1157

Merged
merged 9 commits into from
Apr 28, 2022
Merged

Fix version check #1157

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
613cf4c
update -p --pkg flag for visor
0pcom Apr 17, 2022
7b2026d
change fail on incompatible version behavior per @jdknives specificat…
0pcom Apr 19, 2022
f89711a
remove manual version checks for unknown version
0pcom Apr 22, 2022
0d73290
make format check
0pcom Apr 22, 2022
c33e3c8
change variable names and remove accidentally included comments as su…
0pcom Apr 25, 2022
0e6b703
remove generation of update string for visor / config version mismatc…
0pcom Apr 26, 2022
d7be6f9
fix buildinfo logging order to version-date-commit
0pcom Apr 26, 2022
f672c82
remove global variable skyenv.Ptext
0pcom Apr 26, 2022
cd88cfe
change logging for incompatible config
0pcom Apr 27, 2022
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
15 changes: 5 additions & 10 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 @@ -82,7 +82,7 @@ func init() {
genConfigCmd.Flags().BoolVarP(&stdout, "stdout", "n", false, "write config to stdout")
hiddenflags = append(hiddenflags, "stdout")
genConfigCmd.Flags().StringVarP(&output, "out", "o", "", "output config: "+skyenv.ConfigName)
genConfigCmd.Flags().BoolVarP(&pkgEnv, "pkg", "p", false, "use paths for package: "+skyenv.SkywirePath)
genConfigCmd.Flags().BoolVarP(&pkgEnv, "pkg", "p", false, skyenv.Ptext)
homepath := skyenv.HomePath()
if homepath != "" {
genConfigCmd.Flags().BoolVarP(&usrEnv, "user", "u", false, "use paths for user space: "+homepath)
Expand Down Expand Up @@ -204,15 +204,10 @@ var genConfigCmd = &cobra.Command{
}
//fetch the service endpoints
services = visorconfig.Fetch(mLog, serviceConfURL, stdout)
// skywire-cli config gen -ip || skywire-cli config gen -p
if !stdout && outunset && (selectedOS == "linux") {
if pkgEnv {
if hypervisor {
//default config hypervisor
configName = skyenv.Skywirejson
} else {
configName = skyenv.Skywirevisorjson
}
// skywire-cli config gen -p
if !stdout && outunset {
if pkgEnv && (selectedOS == "linux") {
configName = skyenv.Configjson
confPath = skyenv.SkywirePath + "/" + configName
}
if usrEnv {
Expand Down
Loading