Merge pull request #259 from qrwteyrutiyoup/cleanup

Cleanup

callbacks.go

@@ -4,7 +4,7 @@ import (
 	alpm "github.com/jguer/go-alpm"
 )
 
-func QuestionCallback(question alpm.QuestionAny) {
+func questionCallback(question alpm.QuestionAny) {
 	q, err := question.QuestionInstallIgnorepkg()
 	if err == nil {
 		q.SetInstall(true)

cmd.go

@@ -224,7 +224,7 @@ func initAlpm() (err error) {
 		return
 	}
 
-	alpmHandle.SetQuestionCallback(QuestionCallback)
+	alpmHandle.SetQuestionCallback(questionCallback)
 
 	return
 }

dependencies.go

@@ -63,9 +63,8 @@ func splitDbFromName(pkg string) (string, string) {
 
 	if len(split) == 2 {
 		return split[0], split[1]
-	} else {
-		return "", split[0]
 	}
+	return "", split[0]
 }
 
 // Step two of dependency resolving. We already have all the information on the

install.go

@@ -145,7 +145,7 @@ func install(parser *arguments) error {
 	if !parser.existsArg("gendb") && len(arguments.targets) > 0 {
 		err := passToPacman(arguments)
 		if err != nil {
-			return fmt.Errorf("Error installing repo packages.")
+			return fmt.Errorf("Error installing repo packages")
 		}
 
 		depArguments := makeArguments()
@@ -415,27 +415,6 @@ func cleanEditNumberMenu(pkgs []*rpc.Pkg, bases map[string][]*rpc.Pkg, installed
 	return toClean, toEdit, nil
 }
 
-func askCleanBuilds(pkgs []*rpc.Pkg, bases map[string][]*rpc.Pkg) {
-	for _, pkg := range pkgs {
-		dir := config.BuildDir + pkg.PackageBase + "/"
-
-		if _, err := os.Stat(dir); !os.IsNotExist(err) {
-			str := pkg.Name
-			if len(bases[pkg.PackageBase]) > 1 || pkg.PackageBase != pkg.Name {
-				str += " ("
-				for _, split := range bases[pkg.PackageBase] {
-					str += split.Name + " "
-				}
-				str = str[:len(str)-1] + ")"
-			}
-
-			if !continueTask(str+" Directory exists. Clean Build?", "yY") {
-				_ = os.RemoveAll(config.BuildDir + pkg.PackageBase)
-			}
-		}
-	}
-}
-
 func cleanBuilds(pkgs []*rpc.Pkg) {
 	for i, pkg := range pkgs {
 		dir := config.BuildDir + pkg.PackageBase
@@ -494,32 +473,6 @@ func checkForConflicts(dc *depCatagories) error {
 	return nil
 }
 
-func askEditPkgBuilds(pkgs []*rpc.Pkg, bases map[string][]*rpc.Pkg) error {
-	for _, pkg := range pkgs {
-		dir := config.BuildDir + pkg.PackageBase + "/"
-
-		str := "Edit PKGBUILD? " + pkg.PackageBase
-		if len(bases[pkg.PackageBase]) > 1 || pkg.PackageBase != pkg.Name {
-			str += " ("
-			for _, split := range bases[pkg.PackageBase] {
-				str += split.Name + " "
-			}
-			str = str[:len(str)-1] + ")"
-		}
-
-		if !continueTask(str, "yY") {
-			editcmd := exec.Command(editor(), dir+"PKGBUILD")
-			editcmd.Stdin, editcmd.Stdout, editcmd.Stderr = os.Stdin, os.Stdout, os.Stderr
-			err := editcmd.Run()
-			if err != nil {
-				return fmt.Errorf("Editor did not exit successfully, Abotring: %s", err)
-			}
-		}
-	}
-
-	return nil
-}
-
 func editPkgBuilds(pkgs []*rpc.Pkg) error {
 	pkgbuilds := make([]string, 0, len(pkgs))
 	for _, pkg := range pkgs {

parser.go

@@ -39,7 +39,7 @@ func (set stringSet) toSlice() []string {
 	return slice
 }
 
-func SliceToStringSet(in []string) stringSet {
+func sliceToStringSet(in []string) stringSet {
 	set := make(stringSet)
 
 	for _, v := range in {
@@ -50,7 +50,7 @@ func SliceToStringSet(in []string) stringSet {
 }
 
 func makeStringSet(in ...string) stringSet {
-	return SliceToStringSet(in)
+	return sliceToStringSet(in)
 }
 
 // Parses command line arguments in a way we can interact with programmatically but
@@ -519,8 +519,6 @@ func (parser *arguments) parseStdin() (err error) {
 
 		parser.addTarget(target)
 	}
-
-	return
 }
 
 func (parser *arguments) parseCommandLine() (err error) {