Ensure double spaces are removed from comma-separated inputs, and com…

…mas are trimmed before processing.

cmd/module-auditor/module-auditor.go

@@ -72,6 +72,17 @@ func main() {
 	var boolVerbose = flag.Bool("verbose", false, "false")
 	flag.Parse()
 
+	// Trim each comma-separated entry.
+	*strAliases = strings.Replace(*strAliases, ", ", ",",-1)
+	*strAliases = strings.Replace(*strAliases, " ,", ",",0)
+
+	*strModules = strings.Replace(*strModules, ", ", ",",-1)
+	*strModules = strings.Replace(*strModules, " ,", ",",0)
+
+	*strMakefiles = strings.Replace(*strMakefiles, ", ", ",",-1)
+	*strMakefiles = strings.Replace(*strMakefiles, " ,", ",",0)
+
+
 	var getModulesFromMake = false
 	var projects []string
 	var MakeProjects []string

cmd/site-checker/site-checker.go

@@ -19,6 +19,15 @@ func main() {
 	var boolVerbose = flag.Bool("verbose", false, "adds raw output to end of program.")
 	flag.Parse()
 
+	// Trim each comma-separated entry.
+	*strAliases = strings.Replace(*strAliases, "  ", ",",-1)
+	*strAliases = strings.Replace(*strAliases, ", ", ",",-1)
+	*strAliases = strings.Replace(*strAliases, " ,", ",",0)
+
+	*strCommands = strings.Replace(*strCommands, "  ", ",",-1)
+	*strCommands = strings.Replace(*strAliases, ", ", ",",-1)
+	*strCommands = strings.Replace(*strAliases, " ,", ",",0)
+
 	var FinalOutput []string
 
 	if !strings.Contains(*strPattern, "%v") {

cmd/update-make/main.go

@@ -10,6 +10,12 @@ import (
 func main() {
 	var strMake = flag.String("makes", "", "Comma-separated list of absolute paths to make files to update.")
 	flag.Parse()
+
+	// Trim each comma-separated entry.
+	*strMake = strings.Replace(*strMake, "  ", ",",-1)
+	*strMake = strings.Replace(*strMake, ", ", ",",-1)
+	*strMake = strings.Replace(*strMake, " ,", ",",0)
+
 	if *strMake != "" {
 		Makes := strings.Split(*strMake, ",")
 		for _, Makefile := range Makes {

cmd/user-block/main.go

@@ -17,6 +17,11 @@ func main() {
 	var strUser = flag.String("user", "", "User name for blocking, example 'Firstname Sirname'")
 	flag.Parse()
 
+	// Trim each comma-separated entry.
+	*strUser = strings.Replace(*strUser, "  ", ",",-1)
+	*strUser = strings.Replace(*strUser, ", ", ",",-1)
+	*strUser = strings.Replace(*strUser, " ,", ",",-1)
+
 	if !strings.Contains(*strPattern, "%v") {
 		log.Errorln("Specified pattern does not include alias modifier.")
 		flag.Usage()

cmd/user-create/main.go

@@ -23,6 +23,11 @@ func main() {
 	var boolCreate = flag.Bool("create-user", true, "If required, create the user if it doesn't exist on each alias.")
 	flag.Parse()
 
+	// Trim each comma-separated entry.
+	*strAliases = strings.Replace(*strAliases, "  ", ",",-1)
+	*strAliases = strings.Replace(*strAliases, ", ", ",",-1)
+	*strAliases = strings.Replace(*strAliases, " ,", ",",0)
+
 	if !strings.Contains(*strPattern, "%v") {
 		log.Errorln("Specified pattern does not include alias modifier.")
 		flag.Usage()

cmd/user-unblock/main.go

@@ -17,6 +17,11 @@ func main() {
 	var strUser = flag.String("user", "", "User name for unblocking, example 'Firstname Sirname'")
 	flag.Parse()
 
+	// Trim each comma-separated entry.
+	*strAliases = strings.Replace(*strAliases, "  ", ",",-1)
+	*strAliases = strings.Replace(*strAliases, ", ", ",",-1)
+	*strAliases = strings.Replace(*strAliases, " ,", ",",0)
+
 	if !strings.Contains(*strPattern, "%v") {
 		log.Errorln("Specified pattern does not include alias modifier.")
 		flag.Usage()

cmd/user-verify/main.go

@@ -23,6 +23,11 @@ func main() {
 	var boolCreate = flag.Bool("create-user", false, "If required, create the user if it doesn't exist on each alias.")
 	flag.Parse()
 
+	// Trim each comma-separated entry.
+	*strAliases = strings.Replace(*strAliases, "  ", ",",-1)
+	*strAliases = strings.Replace(*strAliases, ", ", ",",-1)
+	*strAliases = strings.Replace(*strAliases, " ,", ",",-1)
+
 	if !strings.Contains(*strPattern, "%v") {
 		log.Errorln("Specified pattern does not include alias modifier.")
 		flag.Usage()

cmd/yoink-build-site/main.go

@@ -40,6 +40,11 @@ func main() {
 
 	flag.Parse()
 
+	// Trim each comma-separated entry.
+	*Makes = strings.Replace(*Makes, "  ", ",",-1)
+	*Makes = strings.Replace(*Makes, ", ", ",",-1)
+	*Makes = strings.Replace(*Makes, " ,", ",",0)
+
 	if *Site == "" {
 		log.Infoln("Site input is empty")
 	}

cmd/yoink-rebuild-site/main.go

@@ -29,6 +29,11 @@ func main() {
 
 	flag.Parse()
 
+	// Trim each comma-separated entry.
+	*Makes = strings.Replace(*Makes, "  ", ",",-1)
+	*Makes = strings.Replace(*Makes, ", ", ",",-1)
+	*Makes = strings.Replace(*Makes, " ,", ",",0)
+
 	if *Makes == "" {
 		log.Infoln("Makes input is empty")
 	}