From 2d6fe95903ac118811d8f24a5fb3361de09e0114 Mon Sep 17 00:00:00 2001 From: morganamilo Date: Thu, 2 Aug 2018 21:58:03 +0100 Subject: [PATCH] Add yay specific args, drop conflicting args Replace -P/--print with -P/--show Replace --config with --currentconfig --- cmd.go | 4 ++-- parser.go | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/cmd.go b/cmd.go index 3784692d..433ae0b4 100644 --- a/cmd.go +++ b/cmd.go @@ -156,7 +156,7 @@ func handleCmd() (err error) { err = show(passToPacman(cmdArgs)) case "G", "getpkgbuild": err = handleGetpkgbuild() - case "P", "print": + case "P", "show": err = handlePrint() case "Y", "--yay": err = handleYay() @@ -194,7 +194,7 @@ func handlePrint() (err error) { var tmpConfig Configuration defaultSettings(&tmpConfig) fmt.Printf("%v", tmpConfig) - case cmdArgs.existsArg("g", "config"): + case cmdArgs.existsArg("g", "currentconfig"): fmt.Printf("%v", config) case cmdArgs.existsArg("n", "numberupgrades"): err = printNumberOfUpdates() diff --git a/parser.go b/parser.go index 8093623f..5c3fa054 100644 --- a/parser.go +++ b/parser.go @@ -357,7 +357,7 @@ func isArg(arg string) bool { case "V", "version": case "h", "help": case "Y", "yay": - case "P", "print": + case "P", "show": case "G", "getpkgbuild": case "b", "dbpath": case "r", "root": @@ -479,6 +479,11 @@ func isArg(arg string) bool { case "removemake": case "noremovemake": case "askremovemake": + case "complete": + case "stats": + case "news": + case "gendb": + case "currentconfig": default: return false } @@ -647,7 +652,7 @@ func isOp(op string) bool { case "U", "upgrade": // yay specific case "Y", "yay": - case "P", "print": + case "P", "show": case "G", "getpkgbuild": default: return false