diff --git a/.gitignore b/.gitignore index 7a29ecd..d5b3ad4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .vscode epee-service dist/ -dist/* \ No newline at end of file +dist/* +.DS_STORE \ No newline at end of file diff --git a/Makefile b/Makefile index 8a3ce5a..0b0aa40 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ DIST_DIR ?= dist/ GOOS ?= linux ARCH ?= $(shell uname -m) BUILDINFOSDET ?= -GOARCH = $(shell echo $(ARCH) | sed 's/x86_64/amd64/g') +GOARCH = amd64 SOFT_NAME := epee_service SOFT_VERSION := $(shell git describe --tags $(git rev-list --tags --max-count=1)) @@ -48,6 +48,7 @@ package-deb: prepare --package $(DIST_DIR) \ $(OUTPUT_SOFT)=/usr/bin/epee-service \ extra/epee.service=/usr/lib/systemd/system/epee.service + .PHONY: package-rpm package-rpm: prepare fpm -s dir -t rpm -n $(SOFT_NAME) -v $(VERSION_PKG) \ @@ -57,4 +58,4 @@ package-rpm: prepare --license "$(LICENSE) "\ --package $(DIST_DIR) \ $(OUTPUT_SOFT)=/usr/bin/epee-service \ - extra/epee.service=/usr/lib/systemd/system/epee.service \ No newline at end of file + extra/epee.service=/usr/lib/systemd/system/epee.service diff --git a/go.mod b/go.mod index b814594..0a796ca 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,6 @@ module git.gnous.eu/enpls/epee-service go 1.19 -require ( - github.com/sirupsen/logrus v1.9.0 // indirect - golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect -) +require github.com/sirupsen/logrus v1.9.3 + +require golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect diff --git a/go.sum b/go.sum index 64cb7ad..ed65537 100644 --- a/go.sum +++ b/go.sum @@ -1,11 +1,15 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=