From 3fcaf22bbb9425f2f393dcbba492912a8a246f92 Mon Sep 17 00:00:00 2001
From: KatolaZ <katolaz@freaknet.org>
Date: Wed, 26 Jul 2017 10:26:59 +0100
Subject: A first go at gometalinter :-)

---
 exec.go | 42 ++++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

(limited to 'exec.go')

diff --git a/exec.go b/exec.go
index dc7563c..88f878f 100644
--- a/exec.go
+++ b/exec.go
@@ -11,9 +11,9 @@ import (
 	"os/exec"
 )
 
-func exec_local_file(cmd_url *url.URL, args, env []string) error {
+func execLocalFile(cmdURL *url.URL, args, env []string) error {
 
-	cmd := exec.Command(cmd_url.Path, args...)
+	cmd := exec.Command(cmdURL.Path, args...)
 	cmd.Env = env
 	stdout, err := cmd.StdoutPipe()
 
@@ -34,44 +34,42 @@ func exec_local_file(cmd_url *url.URL, args, env []string) error {
 	return err
 }
 
-func check_hash(file, hash string) error {
+func checkHash(file, hash string) error {
 
 	data, err := ioutil.ReadFile(file)
 	if err != nil {
 		return err
 	}
-	hash_bytes := sha256.Sum256(data)
-	computed_hash := fmt.Sprintf("%x", string(hash_bytes[:sha256.Size]))
-	debug.log("[check_hash] configured hash string: %s\n", hash)
-	debug.log("[check_hash] computed hash string: %s\n", computed_hash)
-	if computed_hash == hash {
+	hashBytes := sha256.Sum256(data)
+	computedHash := fmt.Sprintf("%x", string(hashBytes[:sha256.Size]))
+	debug.log("[checkHash] configured hash string: %s\n", hash)
+	debug.log("[checkHash] computed hash string: %s\n", computedHash)
+	if computedHash == hash {
 		return nil
-	} else {
-		return fmt.Errorf("WARNING!!! HASH MISMATCH FOR %s", file)
 	}
-
+	return fmt.Errorf("WARNING!!! HASH MISMATCH FOR %s", file)
 }
 
-func exec_url(cmd_url *url.URL, args, env []string) error {
+func execURL(cmdURL *url.URL, args, env []string) error {
 
 	return nil
 }
 
-func exec_tag(tag *SCORSHtag_cfg, args []string, env []string) []error {
+func execTag(tag *SCORSHtagCfg, args []string, env []string) []error {
 
 	var ret []error
 
 	for _, c := range tag.Commands {
 		debug.log("[tag: %s] attempting command: %s\n", tag.Name, c.URL)
-		cmd_url, err := url.Parse(c.URL)
+		cmdURL, err := url.Parse(c.URL)
 		if err != nil {
 			log.Printf("[tag: %s] error parsing URL: %s", tag.Name, err)
 		} else {
-			if cmd_url.Scheme == "file" {
+			if cmdURL.Scheme == "file" {
 				err = nil
 				// if a hash is specified, check that it matches
 				if c.Hash != "" {
-					err = check_hash(cmd_url.Path, c.Hash)
+					err = checkHash(cmdURL.Path, c.Hash)
 				}
 				// if the hash does not match, abort the command
 				if err != nil {
@@ -80,11 +78,11 @@ func exec_tag(tag *SCORSHtag_cfg, args []string, env []string) []error {
 					continue
 				} else {
 					// finally, the command can be executed
-					err = exec_local_file(cmd_url, args, env)
+					err = execLocalFile(cmdURL, args, env)
 				}
 
-			} else if cmd_url.Scheme == "http" || cmd_url.Scheme == "https" {
-				err = exec_url(cmd_url, args, env)
+			} else if cmdURL.Scheme == "http" || cmdURL.Scheme == "https" {
+				err = execURL(cmdURL, args, env)
 			}
 		}
 		ret = append(ret, err)
@@ -92,13 +90,13 @@ func exec_tag(tag *SCORSHtag_cfg, args []string, env []string) []error {
 	return ret
 }
 
-func set_environment(msg *SCORSHmsg, tag, author, committer string) []string {
+func setEnvironment(msg *SCORSHmsg, tag, author, committer string) []string {
 
 	env := os.Environ()
 	env = append(env, fmt.Sprintf("SCORSH_REPO=%s", msg.Repo))
 	env = append(env, fmt.Sprintf("SCORSH_BRANCH=%s", msg.Branch))
-	env = append(env, fmt.Sprintf("SCORSH_OLDREV=%s", msg.Old_rev))
-	env = append(env, fmt.Sprintf("SCORSH_NEWREV=%s", msg.New_rev))
+	env = append(env, fmt.Sprintf("SCORSH_OLDREV=%s", msg.OldRev))
+	env = append(env, fmt.Sprintf("SCORSH_NEWREV=%s", msg.NewRev))
 	env = append(env, fmt.Sprintf("SCORSH_ID=%s", msg.Id))
 	env = append(env, fmt.Sprintf("SCORSH_TAG=%s", tag))
 	env = append(env, fmt.Sprintf("SCORSH_AUTHOR=%s", author))
-- 
cgit v1.2.3