jpictl: introduce -e for jpictl env to export variables
Signed-off-by: Alejandro Mery <amery@jpi.io>
This commit is contained in:
+9
-1
@@ -16,11 +16,19 @@ var envCmd = &cobra.Command{
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err = m.Env().WriteTo(os.Stdout)
|
_, err = m.Env(*envExport).WriteTo(os.Stdout)
|
||||||
return err
|
return err
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Command Flags
|
||||||
|
var (
|
||||||
|
envExport *bool
|
||||||
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
rootCmd.AddCommand(envCmd)
|
rootCmd.AddCommand(envCmd)
|
||||||
|
|
||||||
|
envExport = envCmd.PersistentFlags().BoolP("export", "e", false,
|
||||||
|
"export generated variables")
|
||||||
}
|
}
|
||||||
|
|||||||
+12
-3
@@ -10,12 +10,15 @@ import (
|
|||||||
// Env is a shell environment factory for this cluster
|
// Env is a shell environment factory for this cluster
|
||||||
type Env struct {
|
type Env struct {
|
||||||
ZoneIterator
|
ZoneIterator
|
||||||
|
|
||||||
|
export bool
|
||||||
}
|
}
|
||||||
|
|
||||||
// Env returns a shell environment factory
|
// Env returns a shell environment factory
|
||||||
func (m *Zones) Env() *Env {
|
func (m *Zones) Env(export bool) *Env {
|
||||||
return &Env{
|
return &Env{
|
||||||
ZoneIterator: m,
|
ZoneIterator: m,
|
||||||
|
export: export,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -63,7 +66,13 @@ func (m *Env) writeEnvVarFn(w io.Writer, fn func(*Env) string, name string, args
|
|||||||
m.writeEnvVar(w, value, name, args...)
|
m.writeEnvVar(w, value, name, args...)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (*Env) writeEnvVar(w io.Writer, value string, name string, args ...any) {
|
func (m *Env) writeEnvVar(w io.Writer, value string, name string, args ...any) {
|
||||||
|
var prefix string
|
||||||
|
|
||||||
|
if m.export {
|
||||||
|
prefix = "export "
|
||||||
|
}
|
||||||
|
|
||||||
if len(args) > 0 {
|
if len(args) > 0 {
|
||||||
name = fmt.Sprintf(name, args...)
|
name = fmt.Sprintf(name, args...)
|
||||||
}
|
}
|
||||||
@@ -71,7 +80,7 @@ func (*Env) writeEnvVar(w io.Writer, value string, name string, args ...any) {
|
|||||||
if name != "" {
|
if name != "" {
|
||||||
value = strings.TrimSpace(value)
|
value = strings.TrimSpace(value)
|
||||||
|
|
||||||
_, _ = fmt.Fprintf(w, "%s=%q\n", name, value)
|
_, _ = fmt.Fprintf(w, "%s%s=%q\n", prefix, name, value)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user