kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

add full output siwtch to wwctl version

Browse Source
This commit is contained in:
mslacken
2022-04-29 10:07:15 +02:00
parent 2f836aaf87
commit 0fd8553bad
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
internal/app/wwctl/version/main.go
View File

@@ -9,21 +9,23 @@ import (
)
func CobraRunE(cmd *cobra.Command, args []string) error {
fmt.Printf("%-20s %-18s\n", "VERSION:", version.GetVersion())
fmt.Printf("%-20s %-18s\n", "BINDIR:", buildconfig.BINDIR())
fmt.Printf("%-20s %-18s\n", "DATADIR:", buildconfig.DATADIR())
fmt.Printf("%-20s %-18s\n", "SYSCONFDIR:", buildconfig.SYSCONFDIR())
fmt.Printf("%-20s %-18s\n", "LOCALSTATEDIR:", buildconfig.LOCALSTATEDIR())
fmt.Printf("%-20s %-18s\n", "SRVDIR:", buildconfig.SRVDIR())
fmt.Printf("%-20s %-18s\n", "TFTPDIR:", buildconfig.TFTPDIR())
fmt.Printf("%-20s %-18s\n", "SYSTEMDDIR:", buildconfig.SYSTEMDDIR())
fmt.Printf("%-20s %-18s\n", "WWOVERLAYDIR:", buildconfig.WWOVERLAYDIR())
fmt.Printf("%-20s %-18s\n", "WWCHROOTDIR:", buildconfig.WWCHROOTDIR())
fmt.Printf("%-20s %-18s\n", "WWPROVISIONDIR:", buildconfig.WWPROVISIONDIR())
fmt.Printf("%-20s %-18s\n", "BASEVERSION:", buildconfig.VERSION())
fmt.Printf("%-20s %-18s\n", "RELEASE:", buildconfig.RELEASE())
fmt.Printf("%-20s %-18s\n", "WWCLIENTDIR:", buildconfig.WWCLIENTDIR())
if ListFull {
fmt.Printf("%-20s %-18s\n", "VERSION:", version.GetVersion())
fmt.Printf("%-20s %-18s\n", "BINDIR:", buildconfig.BINDIR())
fmt.Printf("%-20s %-18s\n", "DATADIR:", buildconfig.DATADIR())
fmt.Printf("%-20s %-18s\n", "SYSCONFDIR:", buildconfig.SYSCONFDIR())
fmt.Printf("%-20s %-18s\n", "LOCALSTATEDIR:", buildconfig.LOCALSTATEDIR())
fmt.Printf("%-20s %-18s\n", "SRVDIR:", buildconfig.SRVDIR())
fmt.Printf("%-20s %-18s\n", "TFTPDIR:", buildconfig.TFTPDIR())
fmt.Printf("%-20s %-18s\n", "SYSTEMDDIR:", buildconfig.SYSTEMDDIR())
fmt.Printf("%-20s %-18s\n", "WWOVERLAYDIR:", buildconfig.WWOVERLAYDIR())
fmt.Printf("%-20s %-18s\n", "WWCHROOTDIR:", buildconfig.WWCHROOTDIR())
fmt.Printf("%-20s %-18s\n", "WWPROVISIONDIR:", buildconfig.WWPROVISIONDIR())
fmt.Printf("%-20s %-18s\n", "BASEVERSION:", buildconfig.VERSION())
fmt.Printf("%-20s %-18s\n", "RELEASE:", buildconfig.RELEASE())
fmt.Printf("%-20s %-18s\n", "WWCLIENTDIR:", buildconfig.WWCLIENTDIR())
} else {
fmt.Println(version.GetVersion())
}
return nil
}

2
internal/app/wwctl/version/root.go
View File

@@ -11,9 +11,11 @@ var (
Args: cobra.ExactArgs(0),
Aliases: []string{"vers"},
}
ListFull bool
)
func init() {
baseCmd.PersistentFlags().BoolVarP(&ListFull, "full", "f", false, "List all compiled in variables.")
}
// GetRootCommand returns the root cobra.Command for the application.