diff --git a/.goreleaser.yml b/.goreleaser.yml index d65550e..0b1dd7f 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -7,15 +7,13 @@ builds: binary: arcast-player env: - CGO_ENABLED=0 + flags: + - -trimpath ldflags: - -s - -w - -X 'main.CommitRef={{ .Commit }}' - -X 'main.Version={{ .Version }}' - gcflags: - - -trimpath="${PWD}" - asmflags: - - -trimpath="${PWD}" goos: - linux goarch: @@ -26,15 +24,13 @@ builds: binary: arcast-client env: - CGO_ENABLED=0 + flags: + - -trimpath ldflags: - -s - -w - -X 'main.CommitRef={{ .Commit }}' - -X 'main.Version={{ .Version }}' - gcflags: - - -trimpath="${PWD}" - asmflags: - - -trimpath="${PWD}" goos: - linux goarch: diff --git a/Makefile b/Makefile index 88a0b0c..ebb6af1 100644 --- a/Makefile +++ b/Makefile @@ -132,7 +132,7 @@ gitea-release: .mktools build-apps goreleaser release-android .PHONY: goreleaser goreleaser: .env .mktools - ( set -o allexport && source .env && set +o allexport && curl -sfL https://goreleaser.com/static/run | VERSION=$(GORELEASER_VERSION) GORELEASER_CURRENT_TAG="$(MKT_PROJECT_VERSION)" bash /dev/stdin $(GORELEASER_ARGS) ) + ( set -o allexport && source .env && set +o allexport && curl -sfL https://goreleaser.com/static/run | VERSION=$(GORELEASER_VERSION) GORELEASER_CURRENT_TAG="$(MKT_PROJECT_VERSION)" GOPATH=$(shell go env GOPATH) bash /dev/stdin $(GORELEASER_ARGS) ) .PHONY: mktools mktools: diff --git a/misc/packaging/player.desktop b/misc/packaging/player.desktop index 02c8ab8..19f579a 100644 --- a/misc/packaging/player.desktop +++ b/misc/packaging/player.desktop @@ -2,6 +2,12 @@ Type=Application Version=1.0 Name=Arcast Player -Comment=Web diffusion server -Path=/usr/bin/arcast-player +GenericName=Web diffusion player +Exec=arcast-player run --additional-chrome-arg incognito --additional-chrome-arg start-maximized Icon=arcast-player +Terminal=false +Categories=Network;Utility + +[Desktop Action kiosk] +Name=Start in kiosk mode +Exec=arcast-player run --additional-chrome-arg incognito --additional-chrome-arg kiosk \ No newline at end of file diff --git a/pkg/config/config.go b/pkg/config/config.go index c4cf427..4e9d656 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -65,7 +65,7 @@ func LoadOrCreate(ctx context.Context, filename string, conf *Config, funcs ...T if data != nil { if err := json.Unmarshal(data, conf); err != nil { - return errors.WithStack(err) + logger.Error(ctx, "could not parse configuration file", logger.CapturedE(errors.WithStack(err))) } }