From cf7cc6ead9691edee20de7a8c5a7313c03be69d9 Mon Sep 17 00:00:00 2001 From: Matt Baer Date: Mon, 5 Feb 2018 00:23:25 -0500 Subject: [PATCH] Move error/quit func to shareable package --- json-to-l10n/main.go | 10 +++------- utils.go | 11 +++++++++++ 2 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 utils.go diff --git a/json-to-l10n/main.go b/json-to-l10n/main.go index 7270c78..7a4bc01 100644 --- a/json-to-l10n/main.go +++ b/json-to-l10n/main.go @@ -1,6 +1,7 @@ package main import ( + "code.as/writeas/internal" "encoding/json" "fmt" "io/ioutil" @@ -10,7 +11,7 @@ import ( func main() { if len(os.Args) < 3 { - outputErr("usage: json-to-l10n filename lang") + internal.ErrQuit("usage: json-to-l10n filename lang") } file := os.Args[1] @@ -32,7 +33,7 @@ var phrases` + strings.ToUpper(lang) + ` = map[string]string{ func parseJSON(filename string) map[string]string { raw, err := ioutil.ReadFile(filename) if err != nil { - outputErr("unable to read file: %v", err) + internal.ErrQuit("unable to read file: %v", err) } r := map[string]string{} @@ -45,8 +46,3 @@ func parseJSON(filename string) map[string]string { } return r } - -func outputErr(s string, args ...interface{}) { - fmt.Fprintf(os.Stderr, s+"\n", args...) - os.Exit(1) -} diff --git a/utils.go b/utils.go new file mode 100644 index 0000000..298ccad --- /dev/null +++ b/utils.go @@ -0,0 +1,11 @@ +package internal + +import ( + "fmt" + "os" +) + +func ErrQuit(s string, args ...interface{}) { + fmt.Fprintf(os.Stderr, s+"\n", args...) + os.Exit(1) +}