From b8ef531b765247e072476dd12144076744b652ad Mon Sep 17 00:00:00 2001
From: morganamilo <morganamilo@gmail.com>
Date: Tue, 3 Apr 2018 17:48:03 +0100
Subject: [PATCH 1/2] Strip request targets instead of making a new one

---
 cmd.go     | 1 -
 install.go | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cmd.go b/cmd.go
index 94de5b39..aeb06952 100644
--- a/cmd.go
+++ b/cmd.go
@@ -379,7 +379,6 @@ func numberMenu(pkgS []string, flags []string) (err error) {
 		aurQ.printSearch(numpq + 1)
 	}
 
-
 	if aurErr != nil {
 		fmt.Printf("Error during AUR search: %s\n", aurErr)
 		fmt.Println("Showing repo packages only")
diff --git a/install.go b/install.go
index 967077e7..f77d1690 100644
--- a/install.go
+++ b/install.go
@@ -72,7 +72,10 @@ func install(parser *arguments) error {
 		parser.targets.set(name)
 	}
 
-	requestTargets = parser.targets.toSlice()
+	for i, pkg := range requestTargets {
+		_, name := splitDbFromName(pkg)
+		requestTargets[i] = name
+	}
 
 	if len(dt.Missing) > 0 {
 		str := bold(red(arrow+" Error: ")) + "Could not find all required packages:"

From faf607c624268401c7aa540a3fd5e3becccd6230 Mon Sep 17 00:00:00 2001
From: morganamilo <morganamilo@gmail.com>
Date: Tue, 3 Apr 2018 18:01:18 +0100
Subject: [PATCH 2/2] 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()