From abffdcff726d0ea881247d56b19bc0f9970af6b6 Mon Sep 17 00:00:00 2001 From: "Collin J. Doering" Date: Fri, 1 Jan 2021 18:48:25 -0500 Subject: [PATCH] rekahsoft-gnu/packages/golang.scm: aws-vault improvements - Do no use a 'v' in the version - Add fish completions - Put completions in correct place (they were slightly off before) - Return #t from phases to avoid warnings --- rekahsoft-gnu/packages/golang.scm | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/rekahsoft-gnu/packages/golang.scm b/rekahsoft-gnu/packages/golang.scm index 1599547..0f19ded 100644 --- a/rekahsoft-gnu/packages/golang.scm +++ b/rekahsoft-gnu/packages/golang.scm @@ -118,12 +118,12 @@ platforms. Gox will also build the cross-compilation toolchain for you.") (define-public aws-vault (package (name "aws-vault") - (version "v6.2.0") + (version "6.2.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/99designs/aws-vault") - (commit version))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 @@ -154,18 +154,22 @@ platforms. Gox will also build the cross-compilation toolchain for you.") (add-before 'build 'patch-version (lambda _ (substitute* "src/github.com/99designs/aws-vault/main.go" - (("var Version = \"dev\"") (string-append "var Version = \"" ,version "\""))))) + (("var Version = \"dev\"") (string-append "var Version = \"v" ,version "\""))))) (add-after 'build 'contrib (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (zsh-site-dir (string-append out "/share/zsh/site-functions")) - (bash-completion-dir (string-append out "/share/bash-completion/completions"))) - (for-each mkdir-p `(,zsh-site-dir ,bash-completion-dir)) - (with-directory-excursion "src/github.com/99designs/aws-vault" - (copy-file "contrib/completions/zsh/aws-vault.zsh" + (bash-completion-dir (string-append out "/share/bash-completion/completions")) + (fish-completion-dir (string-append out "/share/fish/completions"))) + (for-each mkdir-p `(,zsh-site-dir ,bash-completion-dir ,fish-completion-dir)) + (with-directory-excursion "src/github.com/99designs/aws-vault/contrib/completions" + (copy-file "zsh/aws-vault.zsh" (string-append zsh-site-dir "/_aws-vault")) - (copy-file "contrib/completions/bash/aws-vault.bash" - (string-append bash-completion-dir "/aws-vault"))))))))) + (copy-file "bash/aws-vault.bash" + (string-append bash-completion-dir "/aws-vault")) + (copy-file "fish/aws-vault.fish" + (string-append fish-completion-dir "/aws-vault.fish"))) + #t)))))) (synopsis "Vault for securely storing and accessing AWS credentials in development environments")