jayjay
/
k9s
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #362 from brunohms/add-print-short-version 

Print short version (ansible friendly)
mine
Fernand Galiana 2019-10-23 13:13:47 -04:00 committed by GitHub
parent 4a5908446d 77552e3b9a
commit 8f46b9421e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/info.go
View File

@ -24,9 +24,9 @@ func printInfo() {
const sectionFmt = "%-15s " const sectionFmt = "%-15s "
printLogo(color.Cyan) printLogo(color.Cyan)
printTuple(sectionFmt, "Configuration", config.K9sConfigFile) printTuple(sectionFmt, "Configuration", config.K9sConfigFile, color.Cyan)
printTuple(sectionFmt, "Logs", config.K9sLogs) printTuple(sectionFmt, "Logs", config.K9sLogs, color.Cyan)
printTuple(sectionFmt, "Screen Dumps", config.K9sDumpDir) printTuple(sectionFmt, "Screen Dumps", config.K9sDumpDir, color.Cyan)
} }
func printLogo(c color.Paint) { func printLogo(c color.Paint) {

35
cmd/version.go
View File

@ -8,26 +8,41 @@ import (
) )
func versionCmd() *cobra.Command { func versionCmd() *cobra.Command {
return &cobra.Command{ var short bool
command := cobra.Command{
Use: "version", Use: "version",
Short: "Print version/build info", Short: "Print version/build info",
Long: "Print version/build information", Long: "Print version/build information",
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
printVersion() printVersion(short)
}, },
} }
command.PersistentFlags().BoolVarP(&short, "short", "s", false, "Prints K9s version info in short format")
return &command
} }
func printVersion() { func printVersion(short bool) {
const secFmt = "%-10s " const secFmt = "%-10s "
var outputColor color.Paint
printLogo(color.Cyan) if short {
printTuple(secFmt, "Version", version) outputColor = -1
printTuple(secFmt, "Commit", commit) } else {
printTuple(secFmt, "Date", date) outputColor = color.Cyan
printLogo(outputColor)
}
printTuple(secFmt, "Version", version, outputColor)
printTuple(secFmt, "Commit", commit, outputColor)
printTuple(secFmt, "Date", date, outputColor)
} }
func printTuple(format, section, value string) { func printTuple(format, section, value string, outputColor color.Paint) {
fmt.Printf(color.Colorize(fmt.Sprintf(format, section+":"), color.Cyan)) if outputColor != -1 {
fmt.Println(color.Colorize(value, color.White)) section = color.Colorize(fmt.Sprintf(section+":"), outputColor)
value = color.Colorize(value, color.White)
}
fmt.Println(fmt.Sprintf(format, section), value)
} }