X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=main.go;h=52727408962b0030baef955f4c679131e32ad734;hb=b8abeed6c7bddb9d9770f3be93dc41400354783b;hp=cef6c61d41bfe9dfef0c8995ab25cf8b4762d7c9;hpb=01d938ad14224aa2c84f8814ab955bb99f6f5b34;p=nsscash%2Fnsscash.git diff --git a/main.go b/main.go index cef6c61..5272740 100644 --- a/main.go +++ b/main.go @@ -61,7 +61,9 @@ func main() { if err != nil { log.Fatal(err) } - err = WriteStateIfChanged(cfg.StatePath, state) + // NOTE: Make sure to call WriteState() only if there were no + // errors (see WriteState() and README) + err = WriteState(cfg.StatePath, state) if err != nil { log.Fatal(err) } @@ -82,14 +84,29 @@ func main() { if err != nil { log.Fatal(err) } - pws, err := ParsePasswds(bytes.NewReader(src)) - if err != nil { - log.Fatal(err) - } var x bytes.Buffer - err = SerializePasswds(&x, pws) - if err != nil { - log.Fatal(err) + if t == FileTypePlain { + x.Write(src) + } else if t == FileTypePasswd { + pws, err := ParsePasswds(bytes.NewReader(src)) + if err != nil { + log.Fatal(err) + } + err = SerializePasswds(&x, pws) + if err != nil { + log.Fatal(err) + } + } else if t == FileTypeGroup { + grs, err := ParseGroups(bytes.NewReader(src)) + if err != nil { + log.Fatal(err) + } + err = SerializeGroups(&x, grs) + if err != nil { + log.Fatal(err) + } + } else { + log.Fatalf("unsupported file type %v", t) } // We must create the file first or deployFile() will abort