From 42b0dc41e88e324d172cf888d89a0fcee70522db Mon Sep 17 00:00:00 2001
From: Samuel Lorch <sam@lorch.net>
Date: Fri, 10 Sep 2021 09:28:18 +0200
Subject: [PATCH] update archiveing

---
 .github/workflows/.release.yml |  8 +++++---
 .gitignore                     |  1 +
 .goreleaser.yml                | 27 ++++++++++++++++++---------
 README.md                      | 12 ++++++------
 4 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/.release.yml b/.github/workflows/.release.yml
index c5947aa..178ff5d 100644
--- a/.github/workflows/.release.yml
+++ b/.github/workflows/.release.yml
@@ -24,9 +24,11 @@ jobs:
       - 
         name: Generate Man and Completions
         run: |
-          go run main.go completion bash > bash-completion
-          go run main.go completion zsh > zsh-completion
-          go run main.go completion fish > fish-completion
+          mkdir completion
+          go run main.go completion bash > completion/bash
+          go run main.go completion zsh > completion/zsh
+          go run main.go completion fish > completion/fish
+          go run main.go completion powershell > completion/powershell
           mkdir man
           go run main.go gendoc --type man
           pwd
diff --git a/.gitignore b/.gitignore
index 3f5254e..8ed805b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 !*/
 
 man/
+completion/
 
 # Binaries for programs and plugins
 *.exe
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 47d0ba7..2ed9ea4 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -3,6 +3,8 @@ checksum:
   name_template: 'checksums.txt'
 builds:
   - env: [CGO_ENABLED=0]
+  - flags:
+      - -trimpath
     goos:
       - linux
       - windows
@@ -12,12 +14,19 @@ builds:
       - arm64
     binary: passbolt
 archives:
-  - replacements:
-      darwin: Darwin
-      linux: Linux
-      windows: Windows
-      386: i386
-      amd64: x86_64
+  replacements:
+    darwin: Darwin
+    linux: Linux
+    windows: Windows
+    386: i386
+    amd64: x86_64
+  files:
+    - completion/*
+    - man/*
+  - id: windows
+    format_overrides:
+      - goos: windows
+        format: zip
 release:
   draft: true
   header: |
@@ -28,11 +37,11 @@ nfpms:
   homepage: https://github.com/speatzle/go-passbolt-cli
   license: MIT
   contents:
-    - src: /home/runner/work/go-passbolt-cli/go-passbolt-cli/bash-completion
+    - src: /home/runner/work/go-passbolt-cli/go-passbolt-cli/completion/bash
       dst: /usr/share/bash-completion/completions/passbolt
-    - src: /home/runner/work/go-passbolt-cli/go-passbolt-cli/zsh-completion
+    - src: /home/runner/work/go-passbolt-cli/go-passbolt-cli/completion/zsh
       dst: /usr/share/zsh/site-functions/_passbolt
-    - src: /home/runner/work/go-passbolt-cli/go-passbolt-cli/fish-completion
+    - src: /home/runner/work/go-passbolt-cli/go-passbolt-cli/completion/fish
       dst: /usr/share/fish/vendor_completions.d/passbolt.fish
     - src: /home/runner/work/go-passbolt-cli/go-passbolt-cli/man/*
       dst: /usr/share/man/man1/
diff --git a/README.md b/README.md
index 3bd0449..a9c0bb1 100644
--- a/README.md
+++ b/README.md
@@ -6,16 +6,16 @@ If you want to do something more complicated [this](https://github.com/speatzle/
 # Install
 
 ## Via Package:
-    Download your Package from the Latest Release.
-    install via your Distros Package manager like `dpkg -i`
-    
+    Download the Package for your OS and architecture from the Latest Release.
+    Install via your Distros Package manager like `dpkg -i`
+
 ## Via Archive:
-    Download your Archive
-Note: tab completion and manpages will be missing.
+    Download and Extract the Archive for your OS and architecture
+Note: tab completion and manpages will need to be installed manually.
 
 ## Via Go:
     go install github.com/speatzle/go-passbolt-cli
-Note: this will install the binary as go-passbolt-cli also tab completion and manpages will be missing.
+Note: this will install the binary as go-passbolt-cli, also tab completion and manpages will be missing.
 # Getting Started
 First you need to Setup basic information: the Server Address, your Private Key and your Password.
 You have these options: