From faf607c624268401c7aa540a3fd5e3becccd6230 Mon Sep 17 00:00:00 2001 From: morganamilo Date: Tue, 3 Apr 2018 18:01:18 +0100 Subject: [PATCH] Allow help to be used with all Operators --- cmd.go | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/cmd.go b/cmd.go index aeb06952..73161d5b 100644 --- a/cmd.go +++ b/cmd.go @@ -125,6 +125,11 @@ func handleCmd() (err error) { if shouldSaveConfig { config.saveConfig() } + + if cmdArgs.existsArg("h", "help") { + err = handleHelp() + return + } if config.SudoLoop && cmdArgs.needRoot() { sudoLoopBackground() @@ -174,6 +179,15 @@ func handleQuery() error { return err } +func handleHelp() error { + if cmdArgs.op == "Y" || cmdArgs.op == "yay" { + usage() + return nil + } else { + return passToPacman(cmdArgs) + } +} + //this function should only set config options //but currently still uses the switch left over from old code //eventually this should be refactored out futher @@ -284,9 +298,7 @@ func handlePrint() (err error) { func handleYay() (err error) { //_, options, targets := cmdArgs.formatArgs() - if cmdArgs.existsArg("h", "help") { - usage() - } else if cmdArgs.existsArg("gendb") { + if cmdArgs.existsArg("gendb") { err = createDevelDB() } else if cmdArgs.existsArg("c", "clean") { err = cleanDependencies()