Skip to content

Fix 289 #293

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

Merged
Xemdo merged 2 commits into from
Dec 3, 2023
Merged

Fix 289 #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d783250
Changed .Run(...) to .RunE(...); Fixes #289
Xemdo Nov 28, 2023
99d2a52
Merge branch 'main' into fix-289
Xemdo Dec 3, 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
2 changes: 1 addition & 1 deletion cmd/configure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func configureCmdRun(cmd *cobra.Command, args []string) error {
}

if err := viper.WriteConfigAs(configPath); err != nil {
fmt.Errorf("Failed to write configuration: %v", err.Error())
return fmt.Errorf("Failed to write configuration: %v", err.Error())
}

fmt.Println("Updated configuration.")
Expand Down
6 changes: 5 additions & 1 deletion cmd/token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,11 @@ func loginCmdRun(cmd *cobra.Command, args []string) error {

if clientID == "" || clientSecret == "" {
println("No Client ID or Secret found in configuration. Triggering configuration now.")
configureCmd.Run(cmd, args)
err := configureCmd.RunE(cmd, args)
if err != nil {
return err
}

clientID = viper.GetString("clientId")
clientSecret = viper.GetString("clientSecret")
}
Expand Down