Elara6331/pak
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up code

Browse Source
This commit is contained in:
Elara 2021-05-06 10:50:27 -07:00
parent 8480882b32
commit a35f05a13e
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
main.go
View File

@ -35,11 +35,9 @@ var Log = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
func main() {
// Create help flag
var helpFlagGiven bool
flag.BoolVarP(&helpFlagGiven, "help", "h", false, "Show help screen")
helpFlagGiven := flag.BoolP("help", "h", false, "Show help screen")
// Create package manager override flag
var packageManagerOverride string
flag.StringVarP(&packageManagerOverride, "package-manager", "p", os.Getenv("PAK_MGR_OVERRIDE"), "Override package manager wrapped by pak")
packageManagerOverride := flag.StringP("package-manager", "p", os.Getenv("PAK_MGR_OVERRIDE"), "Override package manager wrapped by pak")
// Parse arguments for flags
flag.Parse()
@ -64,9 +62,9 @@ func main() {
config := NewConfig("/etc/pak.toml")
// If override is set
if packageManagerOverride != "" {
if *packageManagerOverride != "" {
// Set active package manager to override
config.ActiveManager = packageManagerOverride
config.ActiveManager = *packageManagerOverride
// Set override state to true
isOverridden = true
} else {
@ -94,8 +92,8 @@ func main() {
similarTo := []string{}
// Displays help message if no arguments provided or -h/--help is passed
if len(args) == 0 || helpFlagGiven || Contains(args, "help") {
printHelpMessage(config.ActiveManager, useRoot, rootCommand, commands, shortcuts, isOverridden)
if len(args) == 0 || *helpFlagGiven || Contains(args, "help") {
printHelpMessage(config.ActiveManager, rootCommand, commands, shortcuts, useRoot, isOverridden)
os.Exit(0)
}
@ -127,16 +125,14 @@ func main() {
if len(similarTo) == 0 {
Log.Fatal().Msg("This command does not match any known commands or shortcuts")
}
// Anonymous function to decide whether to print (overridden)
printOverridden := func() string {
if isOverridden {
return "(overridden)"
} else {
return ""
}
var overriddenStr string
if isOverridden {
overriddenStr = "(overridden)"
} else {
overriddenStr = ""
}
// Print text showing command being run and package manager being used
fmt.Println("Running:", strings.Title(GetKey(commands, similarTo[0])), "using", strings.Title(config.ActiveManager), printOverridden())
fmt.Println("Running:", strings.Title(GetKey(commands, similarTo[0])), "using", strings.Title(config.ActiveManager), overriddenStr)
// Run package manager with the proper arguments passed if more than one argument exists
var cmdArr []string
// If root is to be used, append it to cmdArr

2
usage.go
View File

@ -5,7 +5,7 @@ import (
)
// Print help screen
func printHelpMessage(packageManagerCommand string, useRoot bool, rootCommand string, commands map[string]string, shortcuts map[string]string, isOverridden bool) {
func printHelpMessage(packageManagerCommand, rootCommand string, commands, shortcuts map[string]string, useRoot, isOverridden bool) {
fmt.Println("Arsen Musayelyan's Package Manager Wrapper")
fmt.Print("Current package manager is: ", packageManagerCommand)
if isOverridden {