From 66ff5603b61bb3be9b9f9e8b002d12df83c76590 Mon Sep 17 00:00:00 2001 From: Alexey Boyko Date: Tue, 8 Oct 2019 21:44:01 +0300 Subject: [PATCH] Closes #11 --- .goreleaser.yml | 15 +++++++++++++++ README.md | 10 ++++++++-- ...a_bash_autcomplete => flora_bash_autocomplete} | 0 ...ora_zsh_autcomplete => flora_zsh_autocomplete} | 0 install.sh | 4 ++-- 5 files changed, 25 insertions(+), 4 deletions(-) rename configs/autocomplete/{flora_bash_autcomplete => flora_bash_autocomplete} (100%) rename configs/autocomplete/{flora_zsh_autcomplete => flora_zsh_autocomplete} (100%) diff --git a/.goreleaser.yml b/.goreleaser.yml index 7f1d024..7115847 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -12,6 +12,11 @@ builds: - darwin - linux +archives: + - files: + - configs/autocomplete/* + - LICENSE + checksum: name_template: 'checksums.txt' algorithm: sha256 @@ -28,9 +33,19 @@ brews: caveats: "flora --help" homepage: "https://github.com/ketchoop/flora" description: "Allows to manage and switch between multiple terraform versions" + conflicts: + - terraform custom_block: | head "https://github.com/ketchoop/flora.git" test: | system "#{bin}/flora", "--help" install: | + case File.basename(ENV["SHELL"]) + when "zsh" + zsh_completion.install "configs/autocomplete/flora_zsh_autocomplete" => "_flora" + when "bash" + url "https://raw.githubusercontent.com/ketchoop/flora/master/configs/autocomplete/flora_bash_autocomplete" + bash_completion.install "configs/autocomplete/flora_bash_autocomplete" => "_flora" + end + bin.install "flora" diff --git a/README.md b/README.md index cbaba35..9f1ef76 100644 --- a/README.md +++ b/README.md @@ -17,15 +17,21 @@ compatible with your **.tf manifests** Terraform binary. ## Install +1. By *brew install* +``` +brew install ketchoop/homebrew-tap/flora + +mkdir -p ~/flora/.bin +``` -1. By *go get* +2. By *go get* ``` go get -u github.com/ketchoop/flora/cmd/flora mkdir -p ~/flora/.bin ``` -2. By install.sh +3. By install.sh ``` curl https://raw.githubusercontent.com/ketchoop/flora/master/install.sh | bash ``` diff --git a/configs/autocomplete/flora_bash_autcomplete b/configs/autocomplete/flora_bash_autocomplete similarity index 100% rename from configs/autocomplete/flora_bash_autcomplete rename to configs/autocomplete/flora_bash_autocomplete diff --git a/configs/autocomplete/flora_zsh_autcomplete b/configs/autocomplete/flora_zsh_autocomplete similarity index 100% rename from configs/autocomplete/flora_zsh_autcomplete rename to configs/autocomplete/flora_zsh_autocomplete diff --git a/install.sh b/install.sh index b7f62e2..9857f17 100755 --- a/install.sh +++ b/install.sh @@ -16,14 +16,14 @@ function install_autocompletion() { local zsh_autocomplete_path="/usr/local/share/zsh/site-functions" pushd "$zsh_autocomplete_path" > /dev/null - curl -sL "https://raw.githubusercontent.com/ketchoop/flora/master/configs/autocomplete/flora_zsh_autcomplete" -o _flora + curl -sL "https://raw.githubusercontent.com/ketchoop/flora/master/configs/autocomplete/flora_zsh_autocomplete" -o _flora popd ;; bash) local bash_autocomplete_path="/etc/bash_completion.d" pushd "$bash_autocomplete_path" > /dev/null - curl -sLO "https://raw.githubusercontent.com/ketchoop/flora/master/configs/autocomplete/flora_bash_autcomplete" + curl -sLO "https://raw.githubusercontent.com/ketchoop/flora/master/configs/autocomplete/flora_bash_autocomplete" popd ;; esac