erik/sdkman-for-fish
erik/sdkman-for-fish
1
0
Fork 0
mirror of https://github.com/ethauvin/sdkman-for-fish.git synced 2025-04-25 05:17:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: Support custom install dir

Browse source 
ref: issue #34
This commit is contained in:
Raphael Reitzig 2023-06-27 00:02:25 +02:00
parent 4c15f15ced
commit 66e2f1e623
3 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -13,12 +13,12 @@ this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
### Features ### Features
- Support custom SDKMAN! install path (issue #34)
- Compatibility with SDKMAN! 5.18.2 - Compatibility with SDKMAN! 5.18.2
- Completions for `env`, `home`, `flush` (issue #35) - Completions for `env`, `home`, `flush` (issue #35)
- Correct behaviour of `env clear`. - Correct behaviour of `env clear`.
- Honor `sdkman_auto_env=true` (issue #38) - Honor `sdkman_auto_env=true` (issue #38)
- `broadcast` removed - `broadcast` removed
- TODO: custom SDKMAN! install path (issue #34)
- Compatibility with fisher 4 (PR #37, #39) - Compatibility with fisher 4 (PR #37, #39)
## [1.4.0] - 2019-11-06 ## [1.4.0] - 2019-11-06

4
completions/sdk.fish
View file

@ -1,11 +1,11 @@
# Defines autocompletion for SDKMAN! # Defines autocompletion for SDKMAN!
# Copyright (c) 2018 Raphael Reitzig # Copyright (c) 2018-2022 Raphael Reitzig
# MIT License (MIT) # MIT License (MIT)
# https://github.com/reitzig/sdkman-for-fish # https://github.com/reitzig/sdkman-for-fish
# Guard: SDKMAN! needs to be installed # Guard: SDKMAN! needs to be installed
if not test -f "$HOME/.sdkman/bin/sdkman-init.sh" if not test -f "$SDKMAN_DIR/bin/sdkman-init.sh"
exit 0 exit 0
end end

19
conf.d/sdk.fish
View file

@ -3,11 +3,19 @@
# Makes command and binaries from SDKMAN! available in fish. # Makes command and binaries from SDKMAN! available in fish.
# Delegates to bash for the `sdk` command. # Delegates to bash for the `sdk` command.
# Copyright (c) 2018 Raphael Reitzig # Copyright (c) 2018-2022 Raphael Reitzig
# MIT License (MIT) # MIT License (MIT)
# https://github.com/reitzig/sdkman-for-fish # https://github.com/reitzig/sdkman-for-fish
set __fish_sdkman_init "$HOME/.sdkman/bin/sdkman-init.sh" # Account for custom install locations
if set -q __sdkman_custom_dir
set -gx SDKMAN_DIR "$__sdkman_custom_dir"
else
# This is the default location:
set -gx SDKMAN_DIR "$HOME/.sdkman"
end
set __fish_sdkman_init "$SDKMAN_DIR/bin/sdkman-init.sh"
# Copied from https://github.com/jorgebucaran/fisher/blob/main/functions/fisher.fish to be consistent: # Copied from https://github.com/jorgebucaran/fisher/blob/main/functions/fisher.fish to be consistent:
set --query fisher_path || set --local fisher_path $__fish_config_dir set --query fisher_path || set --local fisher_path $__fish_config_dir
@ -81,17 +89,16 @@ end
# If this is a subshell of a(n initialized) fish owned by the same user, # If this is a subshell of a(n initialized) fish owned by the same user,
# no initialization necessary. # no initialization necessary.
# Otherwise: # Otherwise:
if not set -q SDKMAN_DIR; or test (ls -ld "$SDKMAN_DIR" | awk '{print $3}') != (whoami) if not set -q SDKMAN_CANDIDATES_DIR; or test (ls -ld "$SDKMAN_CANDIDATES_DIR" | awk '{print $3}') != (whoami)
set -e SDKMAN_DIR
__fish_sdkman_run_in_bash "source $__fish_sdkman_init" __fish_sdkman_run_in_bash "source $__fish_sdkman_init"
end end
# Set up autoenv # Set up auto_env
if grep -q "^sdkman_auto_env=true" "$SDKMAN_DIR/etc/config" if grep -q "^sdkman_auto_env=true" "$SDKMAN_DIR/etc/config"
function __fish_sdkman_autoenv --on-variable PWD function __fish_sdkman_autoenv --on-variable PWD
# Run the (modified) init script, which performs the checks and calls for us! # Run the (modified) init script, which performs the checks and calls for us!
__fish_sdkman_run_in_bash "source \"$__fish_sdkman_noexport_init\"" __fish_sdkman_run_in_bash "source \"$__fish_sdkman_noexport_init\""
set -x SDKMAN_OLD_PWD "$PWD" set -x SDKMAN_OLD_PWD "$PWD" # needed by the Bash implementation
end end
end end