Merge branch 'develop'

[nncp.git] / src / cmd / nncp-cfgdir / main.go

diff --git a/src/cmd/nncp-cfgdir/main.go b/src/cmd/nncp-cfgdir/main.go
index 29da2c7f2989b5da1b02d7052a46881286272aae..9c5b420d5fe865c488d5c3d959325ce5c48f6b00 100644 (file)
--- a/src/cmd/nncp-cfgdir/main.go
+++ b/src/cmd/nncp-cfgdir/main.go
@@ -21,17 +21,15 @@ package main
 import (
        "flag"
        "fmt"
-       "io/ioutil"
        "log"
        "os"
 
-       "github.com/hjson/hjson-go"
+       "github.com/hjson/hjson-go/v4"
        "go.cypherpunks.ru/nncp/v8"
 )
 
 func usage() {
-       fmt.Fprintf(os.Stderr, nncp.UsageHeader())
-       fmt.Fprintf(os.Stderr, "nncp-cfgdir -- Convert configuration file to the directory layout.\n\n")
+       fmt.Fprint(os.Stderr, "nncp-cfgdir -- Convert configuration file to the directory layout.\n\n")
        fmt.Fprintf(os.Stderr, "Usage: %s [options] [-cfg ...] -dump /path/to/dir\n", os.Args[0])
        fmt.Fprintf(os.Stderr, "       %s [options] -load /path/to/dir > cfg.hjson\nOptions:\n", os.Args[0])
        flag.PrintDefaults()
@@ -63,7 +61,7 @@ func main() {
        }
 
        if *doDump {
-               cfgRaw, err := ioutil.ReadFile(*cfgPath)
+               cfgRaw, err := os.ReadFile(*cfgPath)
                if err != nil {
                        log.Fatalln(err)
                }
@@ -88,7 +86,6 @@ func main() {
                        BracesSameLine: true,
                        QuoteAlways:    false,
                        IndentBy:       "  ",
-                       AllowMinusZero: false,
                })
                if err != nil {
                        log.Fatalln(err)