Merge branch 'main' into vault-cli

# Conflicts:
#	pkg/content_manager.go
#	pkg/package_manager.go

Author: dominik-przybyl-wttech

.goreleaser.yaml

@@ -19,6 +19,8 @@ builds:
       - linux
       - windows
       - darwin
+    tags:
+      - timetzdata
     ldflags:
       - "-s -w -X main.appVersion={{ .Version }} -X main.appCommit={{ .Commit }} -X main.appCommitDate={{.CommitDate}}"
 

Makefile

@@ -2,6 +2,7 @@
 .GIT_COMMIT_DATE=$(shell git log -1 --date=format:'%Y-%m-%dT%H:%M:%S' --format=%cd)
 .GIT_VERSION=$(shell git describe --tags 2>/dev/null || echo "$(.GIT_COMMIT)")
 .LD_FLAGS=$(shell echo "-s -w -X main.appVersion=${.GIT_VERSION} -X main.appCommit=${.GIT_COMMIT} -X main.appCommitDate=${.GIT_COMMIT_DATE}")
+.TAGS=timetzdata
 
 all: deps test vet fmt lint install
 
@@ -25,15 +26,15 @@ lint:
 	revive -config revive.toml -formatter friendly ./...
 
 build:
-	go build --ldflags "${.LD_FLAGS}" -o bin/aem ./cmd/aem
+	go build -tags "${.TAGS}" --ldflags "${.LD_FLAGS}" -o bin/aem ./cmd/aem
 
 install:
-	go install --ldflags "${.LD_FLAGS}" ./cmd/aem
+	go install -tags "${.TAGS}" --ldflags "${.LD_FLAGS}" ./cmd/aem
 
 other_build:
-	GOARCH=amd64 GOOS=darwin go build --ldflags "${.LD_FLAGS}" -o bin/aem.darwin ./cmd/aem
-	GOARCH=amd64 GOOS=linux go build --ldflags "${.LD_FLAGS}" -o bin/aem.linux ./cmd/aem
-	GOARCH=amd64 GOOS=windows go build --ldflags "${.LD_FLAGS}" -o bin/aem.exe ./cmd/aem
+	GOARCH=amd64 GOOS=darwin  go build -tags "${.TAGS}" --ldflags "${.LD_FLAGS}" -o bin/aem.darwin ./cmd/aem
+	GOARCH=amd64 GOOS=linux   go build -tags "${.TAGS}" --ldflags "${.LD_FLAGS}" -o bin/aem.linux  ./cmd/aem
+	GOARCH=amd64 GOOS=windows go build -tags "${.TAGS}" --ldflags "${.LD_FLAGS}" -o bin/aem.exe    ./cmd/aem
 
 clean:
 	go clean

pkg/content_manager.go

@@ -7,8 +7,8 @@ import (
 	"github.com/wttech/aemc/pkg/common/timex"
 	"github.com/wttech/aemc/pkg/common/tplx"
 	"github.com/wttech/aemc/pkg/content"
-	"github.com/wttech/aemc/pkg/pkg"
 	"os"
+	"github.com/wttech/aemc/pkg/pkg"
 	"path/filepath"
 	"regexp"
 	"strings"

pkg/package_manager.go

@@ -200,11 +200,6 @@ func (pm *PackageManager) Create(opts PackageCreateOpts) (string, error) {
 			return "", err
 		}
 	}
-	if opts.ContentPath != "" {
-		if err = pm.copyContentFiles(opts, tmpDir); err != nil {
-			return "", err
-		}
-	}
 	if err = content.Zip(tmpDir, tmpFile); err != nil {
 		return "", err
 	}