Move shell to package

handlers/day.go

@@ -1,14 +1,12 @@
 package handlers
 
 import (
-	"fmt"
 	"goirc/bot"
-	"os/exec"
-	"strings"
+	"goirc/shell"
 )
 
 func NationalDay(params bot.HandlerParams) error {
-	r, err := shell(`curl -s https://nationaltoday.com/ | pup '.holiday-title-text json{}' | jq -r .[0].text`)
+	r, err := shell.Command(`curl -s https://nationaltoday.com/ | pup '.holiday-title-text json{}' | jq -r .[0].text`)
 	if err != nil {
 		params.Privmsgf(params.Target, "error: %v", err)
 	}
@@ -17,18 +15,3 @@ func NationalDay(params bot.HandlerParams) error {
 
 	return nil
 }
-
-func shell(command string) (string, error) {
-	cmd := exec.Command("/bin/sh", "-c", command)
-
-	var stdout, stderr strings.Builder
-
-	cmd.Stdout = &stdout
-	cmd.Stderr = &stderr
-
-	if err := cmd.Run(); err != nil {
-		return "", fmt.Errorf("%s", stderr.String())
-	}
-
-	return stdout.String(), nil
-}

handlers/mlb/mlb.go

@@ -3,6 +3,7 @@ package mlb
 import (
 	"fmt"
 	"goirc/bot"
+	"goirc/shell"
 	"sort"
 	"strconv"
 	"strings"
@@ -14,7 +15,7 @@ func SingleTeamOdds(params bot.HandlerParams) error {
 
 	date := time.Now().Format(time.DateOnly)
 
-	r, err := shell(fmt.Sprintf(`
+	r, err := shell.Command(fmt.Sprintf(`
 curl -s 'https://www.fangraphs.com/api/playoff-odds/odds?dateEnd=%s&dateDelta=&projectionMode=2&standingsType=div' |\
 jq .[] |\
 jq 'select(.abbName == "%s")'.endData.poffTitle
@@ -36,7 +37,7 @@ jq 'select(.abbName == "%s")'.endData.poffTitle
 func Teams(params bot.HandlerParams) error {
 	date := time.Now().Format(time.DateOnly)
 
-	r, err := shell(fmt.Sprintf(`
+	r, err := shell.Command(fmt.Sprintf(`
 curl -s 'https://www.fangraphs.com/api/playoff-odds/odds?dateEnd=%s&dateDelta=&projectionMode=2&standingsType=div' | jq -r .[].abbName
 `, date))
 	if err != nil {

shell/command.go

@@ -0,0 +1,22 @@
+package shell
+
+import (
+	"fmt"
+	"os/exec"
+	"strings"
+)
+
+func Command(command string) (string, error) {
+	cmd := exec.Command("/bin/sh", "-c", command)
+
+	var stdout, stderr strings.Builder
+
+	cmd.Stdout = &stdout
+	cmd.Stderr = &stderr
+
+	if err := cmd.Run(); err != nil {
+		return "", fmt.Errorf("%s", stderr.String())
+	}
+
+	return stdout.String(), nil
+}