Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
reitzig committed Nov 9, 2018
2 parents 050aa57 + 189739c commit 083d2d3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,18 @@
Makes command `sdk` from [SDKMAN!] available in fish.
Also provides auto-completion and adds binaries from installed SDKs to the PATH.

Tested with fish 2.7.1 and SDKMAN! 5.7.1.
Tested with fish 2.7.1 and SDKMAN! 5.7.3.

## Install

With [fisherman] (install separately):
With [fisher] (install separately):

```
fisher reitzig/sdkman-for-fish
fisher add reitzig/sdkman-for-fish
```

_Note:_ Only compatible with fisher v3 upwards; v2 is no longer supported.

## Usage

It's all in the background; you should be able to run `sdk` and binaries installed
Expand All @@ -28,6 +30,6 @@ with `sdk` as you would expect.
see [his comment on sdkman/sdkman-cli#294](https://github.com/sdkman/sdkman-cli/issues/294#issuecomment-318252058).

[SDKMAN!]: https://github.com/sdkman/sdkman-cli
[fisherman]: https://github.com/fisherman/fisherman
[fisher]: https://github.com/jorgebucaran/fisher
[travis-link]: https://travis-ci.org/reitzig/sdkman-for-fish
[travis-badge]: https://travis-ci.org/reitzig/sdkman-for-fish.svg?branch=master
[travis-badge]: https://travis-ci.org/reitzig/sdkman-for-fish.svg?branch=master
2 changes: 1 addition & 1 deletion conf.d/sdk.fish
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# https://github.com/reitzig/sdkman-for-fish

set __fish_sdkman_init "$HOME/.sdkman/bin/sdkman-init.sh"
set __fish_sdkman_noexport_init "$HOME/.config/fisherman/sdkman-for-fish/sdkman-noexport-init.sh"
set __fish_sdkman_noexport_init "$HOME/.config/fisher/github.com/reitzig/sdkman-for-fish/sdkman-noexport-init.sh"

# Guard: SDKMAN! needs to be installed
if not test -f "$__fish_sdkman_init"
Expand Down

0 comments on commit 083d2d3

Please sign in to comment.