aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2018-02-13 01:22:10 +0100
committerDimitri Sokolyuk <demon@dim13.org>2018-02-13 01:22:10 +0100
commit8bb62c061174bc9098d7ccf1b6772783f1336ba9 (patch)
treebc2bcddefe55e52b931924664617b0df5b1f9e48
parentc32d9bf24c3b670c3a56ea55aeefb6232f3d4ec8 (diff)
combine
-rw-r--r--cmd_check.go (renamed from check.go)0
-rw-r--r--cmd_generate.go (renamed from generate.go)0
-rw-r--r--cmd_sign.go (renamed from sign.go)0
-rw-r--r--cmd_verify.go (renamed from verify.go)0
-rw-r--r--main.go11
-rw-r--r--progname.go16
6 files changed, 11 insertions, 16 deletions
diff --git a/check.go b/cmd_check.go
index 2dfb786..2dfb786 100644
--- a/check.go
+++ b/cmd_check.go
diff --git a/generate.go b/cmd_generate.go
index 74c24e5..74c24e5 100644
--- a/generate.go
+++ b/cmd_generate.go
diff --git a/sign.go b/cmd_sign.go
index 91b58ea..91b58ea 100644
--- a/sign.go
+++ b/cmd_sign.go
diff --git a/verify.go b/cmd_verify.go
index c38955d..c38955d 100644
--- a/verify.go
+++ b/cmd_verify.go
diff --git a/main.go b/main.go
index 5088e84..1c6a0b6 100644
--- a/main.go
+++ b/main.go
@@ -3,11 +3,22 @@ package main
import (
"context"
"flag"
+ "log"
"os"
+ "path"
"github.com/google/subcommands"
)
+func init() {
+ log.SetFlags(0)
+ log.SetPrefix(progName() + ": ")
+}
+
+func progName() string {
+ return path.Base(os.Args[0])
+}
+
func main() {
subcommands.Register(subcommands.CommandsCommand(), "")
subcommands.Register(subcommands.FlagsCommand(), "")
diff --git a/progname.go b/progname.go
deleted file mode 100644
index 5f14ac5..0000000
--- a/progname.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package main
-
-import (
- "log"
- "os"
- "path"
-)
-
-func init() {
- log.SetFlags(0)
- log.SetPrefix(progName() + ": ")
-}
-
-func progName() string {
- return path.Base(os.Args[0])
-}