diff --git a/README.md b/README.md index 37776f8..8155a38 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,5 @@ -# packager +# nfpm + +> NFPM is not FPM. + WIP: simple deb/rpm packager written in Go diff --git a/cmd/packager/main.go b/cmd/packager/main.go index 2068ea4..907899f 100644 --- a/cmd/packager/main.go +++ b/cmd/packager/main.go @@ -6,9 +6,9 @@ import ( "os" "github.com/alecthomas/kingpin" - "github.com/goreleaser/packager" - "github.com/goreleaser/packager/deb" - "github.com/goreleaser/packager/rpm" + "github.com/goreleaser/nfpm" + "github.com/goreleaser/nfpm/deb" + "github.com/goreleaser/nfpm/rpm" yaml "gopkg.in/yaml.v1" ) @@ -28,7 +28,7 @@ func main() { var info packager.Info kingpin.FatalIfError(yaml.Unmarshal(bts, &info), "%v") - var packager packager.Packager + var packager nfpm.Packager switch *format { case "deb": packager = deb.Default diff --git a/deb/deb.go b/deb/deb.go index da6351e..8aecc00 100644 --- a/deb/deb.go +++ b/deb/deb.go @@ -1,4 +1,4 @@ -// Package deb implements packager.Packager providing .deb bindings. +// Package deb implements nfpm.Packager providing .deb bindings. package deb import ( @@ -14,10 +14,10 @@ import ( "time" "github.com/blakesmith/ar" - "github.com/goreleaser/packager" + "github.com/goreleaser/nfpm" ) -var _ packager.Packager = Default +var _ nfpm.Packager = Default // Default deb packager var Default = &Deb{} @@ -26,7 +26,7 @@ var Default = &Deb{} type Deb struct{} // Package writes a new deb package to the given writer using the given info -func (*Deb) Package(info packager.Info, deb io.Writer) (err error) { +func (*Deb) Package(info nfpm.Info, deb io.Writer) (err error) { var now = time.Now() dataTarGz, md5sums, instSize, err := createDataTarGz(now, info) if err != nil { @@ -66,7 +66,7 @@ func addArFile(now time.Time, w *ar.Writer, name string, body []byte) error { return err } -func createDataTarGz(now time.Time, info packager.Info) (dataTarGz, md5sums []byte, instSize int64, err error) { +func createDataTarGz(now time.Time, info nfpm.Info) (dataTarGz, md5sums []byte, instSize int64, err error) { var buf bytes.Buffer var compress = gzip.NewWriter(&buf) var out = tar.NewWriter(compress) @@ -134,11 +134,11 @@ Description: {{.Info.Description}} ` type controlData struct { - Info packager.Info + Info nfpm.Info InstalledSize int64 } -func createControl(now time.Time, instSize int64, md5sums []byte, info packager.Info) (controlTarGz []byte, err error) { +func createControl(now time.Time, instSize int64, md5sums []byte, info nfpm.Info) (controlTarGz []byte, err error) { var buf bytes.Buffer var compress = gzip.NewWriter(&buf) var out = tar.NewWriter(compress) diff --git a/deb/deb_test.go b/deb/deb_test.go index 50688c3..5fbd77e 100644 --- a/deb/deb_test.go +++ b/deb/deb_test.go @@ -4,13 +4,13 @@ import ( "io/ioutil" "testing" - "github.com/goreleaser/packager" + "github.com/goreleaser/nfpm" "github.com/tj/assert" ) func TestDeb(t *testing.T) { var err = Default.Package( - packager.Info{ + nfpm.Info{ Name: "foo", Arch: "amd64", Depends: []string{ diff --git a/pkg.go b/pkg.go index fc6c424..50fa56a 100644 --- a/pkg.go +++ b/pkg.go @@ -1,6 +1,6 @@ -// Package pkg provides ways to package programs in some linux packaging +// Package nfpm provides ways to package programs in some linux packaging // formats. -package packager +package nfpm import "io" diff --git a/rpm/rpm.go b/rpm/rpm.go index a0f4bcd..25cb989 100644 --- a/rpm/rpm.go +++ b/rpm/rpm.go @@ -13,10 +13,10 @@ import ( "github.com/alecthomas/template" "github.com/goreleaser/archive" - "github.com/goreleaser/packager" + "github.com/goreleaser/nfpm" ) -var _ packager.Packager = Default +var _ nfpm.Packager = Default // Default deb packager var Default = &RPM{} @@ -25,7 +25,7 @@ var Default = &RPM{} type RPM struct{} // Package writes a new RPM package to the given writer using the given info -func (*RPM) Package(info packager.Info, w io.Writer) error { +func (*RPM) Package(info nfpm.Info, w io.Writer) error { if info.Arch == "amd64" { info.Arch = "x86_64" } diff --git a/rpm/rpm_test.go b/rpm/rpm_test.go index 5d91955..6449bff 100644 --- a/rpm/rpm_test.go +++ b/rpm/rpm_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/goreleaser/packager" + "github.com/goreleaser/nfpm" "github.com/tj/assert" ) @@ -12,7 +12,7 @@ func TestRPM(t *testing.T) { f, err := os.Create("foo.rpm") assert.NoError(t, err) err = Default.Package( - packager.Info{ + nfpm.Info{ Name: "foo", Arch: "amd64", Platform: "linux",