From 5bae8e81a60e29a0b1464c0b0b5643d3e2ef84e9 Mon Sep 17 00:00:00 2001
From: Jguer <joaogg3@gmail.com>
Date: Wed, 14 Jun 2017 08:47:17 +0100
Subject: [PATCH] Refactoring

---
 aur/result.go | 10 +++++-----
 yay.go        |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/aur/result.go b/aur/result.go
index 3f4edb0f..03382b3d 100644
--- a/aur/result.go
+++ b/aur/result.go
@@ -66,7 +66,7 @@ func printDeps(repoDeps []string, aurDeps []string) {
 	}
 }
 
-func setupPackageSpace(a *rpc.Pkg) (err error) {
+func setupPackageSpace(a *rpc.Pkg) (pkgbuild *gopkg.PKGBUILD, err error) {
 	dir := config.YayConf.BuildDir + a.PackageBase + "/"
 
 	if _, err = os.Stat(dir); !os.IsNotExist(err) {
@@ -85,9 +85,9 @@ func setupPackageSpace(a *rpc.Pkg) (err error) {
 		editcmd.Run()
 	}
 
-	pkgb, err := gopkg.ParseSRCINFO(dir + ".SRCINFO")
+	pkgbuild, err = gopkg.ParseSRCINFO(dir + ".SRCINFO")
 	if err == nil {
-		for _, pkgsource := range pkgb.Source {
+		for _, pkgsource := range pkgbuild.Source {
 			owner, repo := vcs.ParseSource(pkgsource)
 			if owner != "" && repo != "" {
 				err = vcs.BranchInfo(a.Name, owner, repo)
@@ -113,7 +113,8 @@ func PkgInstall(a *rpc.Pkg, flags []string) (finalmdeps []string, err error) {
 		fmt.Println("\x1b[1;31;40m==> Warning:\x1b[0;;40m This package is orphaned.\x1b[0m")
 	}
 
-	if err = setupPackageSpace(a); err != nil {
+	_, err = setupPackageSpace(a)
+	if err != nil {
 		return
 	}
 
@@ -236,7 +237,6 @@ func PrintInfo(a *rpc.Pkg) {
 	if a.OutOfDate != 0 {
 		fmt.Println("\x1b[1;37mOut-of-date     :\x1b[0m", "Yes")
 	}
-
 }
 
 // RemoveMakeDeps receives a make dependency list and removes those
diff --git a/yay.go b/yay.go
index 14666d39..dd408c41 100644
--- a/yay.go
+++ b/yay.go
@@ -35,6 +35,8 @@ func usage() {
     --topdown            shows repository's packages first and then aur's
     --bottomup           shows aur's packages first and then repository's
     --noconfirm          skip user input on package install
+	--devel			     Check -git/-svn/-hg development version
+	--nodevel			 Disable development version checking
 `)
 }
 
@@ -91,7 +93,6 @@ func parser() (op string, options []string, packages []string, changedConfig boo
 			}
 			continue
 		}
-
 		packages = append(packages, arg)
 	}
 	return