Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit 03226a0

Browse files
committed
Clean up cmd errors
Signed-off-by: Christopher Crone <[email protected]>
1 parent cb3d019 commit 03226a0

File tree

3 files changed

+6
-14
lines changed

3 files changed

+6
-14
lines changed

cmd/helm.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package cmd
22

33
import (
44
"fmt"
5-
"os"
65
"strings"
76

87
"github.com/docker/cli/cli"
@@ -20,12 +19,10 @@ var helmCmd = &cobra.Command{
2019
for _, v := range helmEnv {
2120
kv := strings.SplitN(v, "=", 2)
2221
if len(kv) != 2 {
23-
fmt.Printf("Missing '=' in setting '%s', expected KEY=VALUE\n", v)
24-
os.Exit(1)
22+
return fmt.Errorf("Missing '=' in setting '%s', expected KEY=VALUE", v)
2523
}
2624
if _, ok := d[kv[0]]; ok {
27-
fmt.Printf("Duplicate command line setting: '%s'\n", kv[0])
28-
os.Exit(1)
25+
return fmt.Errorf("Duplicate command line setting: '%s'", kv[0])
2926
}
3027
d[kv[0]] = kv[1]
3128
}

cmd/image-add.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package cmd
22

33
import (
44
"fmt"
5-
"os"
65
"strings"
76

87
"github.com/docker/lunchbox/image"
@@ -19,8 +18,7 @@ var imageAddCmd = &cobra.Command{
1918
for _, v := range imageAddEnv {
2019
kv := strings.SplitN(v, "=", 2)
2120
if len(kv) != 2 {
22-
fmt.Printf("Malformed env input: '%s'\n", v)
23-
os.Exit(1)
21+
return fmt.Errorf("Malformed env input: '%s'", v)
2422
}
2523
d[kv[0]] = kv[1]
2624
}

cmd/render.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package cmd
22

33
import (
44
"fmt"
5-
"os"
65
"strings"
76

87
"github.com/docker/cli/cli"
@@ -28,12 +27,10 @@ Override is provided in different ways:
2827
for _, v := range renderEnv {
2928
kv := strings.SplitN(v, "=", 2)
3029
if len(kv) != 2 {
31-
fmt.Printf("Missing '=' in setting '%s', expected KEY=VALUE\n", v)
32-
os.Exit(1)
30+
return fmt.Errorf("Missing '=' in setting '%s', expected KEY=VALUE", v)
3331
}
3432
if _, ok := d[kv[0]]; ok {
35-
fmt.Printf("Duplicate command line setting: '%s'\n", kv[0])
36-
os.Exit(1)
33+
return fmt.Errorf("Duplicate command line setting: '%s'", kv[0])
3734
}
3835
d[kv[0]] = kv[1]
3936
}
@@ -45,7 +42,7 @@ Override is provided in different ways:
4542
if err != nil {
4643
return err
4744
}
48-
fmt.Printf("%s", string(res))
45+
fmt.Print(string(res))
4946
return nil
5047
},
5148
}

0 commit comments

Comments
 (0)