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-27 21:58:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix reinitialization test.

Browse source
This commit is contained in:
Raphael Reitzig 2019-11-05 03:37:16 +01:00
parent 04a8c8574a
commit 415c2a0bb2
2 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
conf.d/sdk.fish
View file

@ -18,8 +18,8 @@ end
# Hack for issue #19: # Hack for issue #19:
# Create version of sdkman-init that doesn't export any environment variables. # Create version of sdkman-init that doesn't export any environment variables.
# Refresh if sdkman-init changed. # Refresh if sdkman-init changed.
if begin not test -f "$__fish_sdkman_noexport_init"; if begin not test -f "$__fish_sdkman_noexport_init";
or env test "$__fish_sdkman_init" -nt "$__fish_sdkman_noexport_init" or env test "$__fish_sdkman_init" -nt "$__fish_sdkman_noexport_init"
end end
mkdir -p (dirname $__fish_sdkman_noexport_init) mkdir -p (dirname $__fish_sdkman_noexport_init)
sed -e 's/^\(\s*\).*\(export\|to_path\).*$/\1:/g' "$__fish_sdkman_init" \ sed -e 's/^\(\s*\).*\(export\|to_path\).*$/\1:/g' "$__fish_sdkman_init" \
@ -78,6 +78,7 @@ end
# no initialization necessary. # no initialization necessary.
# Otherwise: # Otherwise:
if not set -q SDKMAN_DIR; or test (stat -c "%U" $SDKMAN_DIR) != (whoami) if not set -q SDKMAN_DIR; or test (stat -c "%U" $SDKMAN_DIR) != (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

2
test/reinitialize.fish
View file

@ -16,7 +16,7 @@ begin
end end
begin begin
set SDKMAN_DIR "/" # belongs to root, who hopefully doesn't run this set -x SDKMAN_DIR "/" # belongs to root, who hopefully doesn't run this
set in_new_shell (fish -lc 'echo $SDKMAN_DIR') set in_new_shell (fish -lc 'echo $SDKMAN_DIR')
if [ "$in_new_shell" != "$proper_value" ] if [ "$in_new_shell" != "$proper_value" ]
echo "SDKMAN_DIR reinitialized to $in_new_shell instead of $proper_value" echo "SDKMAN_DIR reinitialized to $in_new_shell instead of $proper_value"