From 7a8de8fc4b3a9ed1ad542dd7e61df8d6a6892dcb Mon Sep 17 00:00:00 2001 From: Neeraj Gupta <254676+ua741@users.noreply.github.com> Date: Wed, 25 Oct 2023 17:56:53 +0530 Subject: [PATCH] Fix path --- .goreleaser.yaml | 42 ++++++++++++++++++++++++------------- cmd/root.go | 2 +- pkg/remote_to_disk_album.go | 2 +- 3 files changed, 30 insertions(+), 16 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 0e99c1c..870d6f7 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -21,20 +21,34 @@ builds: - windows - darwin -#archives: -# - format: tar.gz -# # this name template makes the OS and Arch compatible with the results of `uname`. -# name_template: >- -# {{ .ProjectName }}_ -# {{- title .Os }}_ -# {{- if eq .Arch "amd64" }}x86_64 -# {{- else if eq .Arch "386" }}i386 -# {{- else }}{{ .Arch }}{{ end }} -# {{- if .Arm }}v{{ .Arm }}{{ end }} -# # use zip for windows archives -# format_overrides: -# - goos: windows -# format: zip +nfpms: + - package_name: ente + homepage: https://github.com/ente-io/cli + maintainer: ente.io + description: |- + Command Line Utility for exporting data from https://ente.io + formats: + - rpm + - deb + - apk + +sboms: + - artifacts: archive + +archives: + - format: tar.gz + # this name template makes the OS and Arch compatible with the results of `uname`. + name_template: >- + {{ .ProjectName }}_ + {{- title .Os }}_ + {{- if eq .Arch "amd64" }}x86_64 + {{- else if eq .Arch "386" }}i386 + {{- else }}{{ .Arch }}{{ end }} + {{- if .Arm }}v{{ .Arm }}{{ end }} + # use zip for windows archives + format_overrides: + - goos: windows + format: zip changelog: sort: asc diff --git a/cmd/root.go b/cmd/root.go index 2453f39..1b39fa6 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -11,7 +11,7 @@ import ( "github.com/spf13/cobra" ) -const AppVersion = "0.1.3" +const AppVersion = "0.1.5" var ctrl *pkg.ClICtrl diff --git a/pkg/remote_to_disk_album.go b/pkg/remote_to_disk_album.go index 6253a3e..247d054 100644 --- a/pkg/remote_to_disk_album.go +++ b/pkg/remote_to_disk_album.go @@ -59,7 +59,7 @@ func (c *ClICtrl) createLocalFolderForRemoteAlbums(ctx context.Context, account } } // Create album and meta folders if they don't exist - albumPath := filepath.Join(path, albumFolderName) + albumPath := filepath.Clean(filepath.Join(path, albumFolderName)) metaPath := filepath.Join(albumPath, ".meta") if metaByID == nil { log.Printf("Adding folder %s for album %s", albumFolderName, album.AlbumName)