From 2f6b2dc1b611479c1d066f9b5d1af13725025b87 Mon Sep 17 00:00:00 2001 From: Raphael Reitzig <4246780+reitzig@users.noreply.github.com> Date: Thu, 12 Jul 2018 00:26:34 +0200 Subject: [PATCH] Do not declare function/command sdk if sdkman is not installed. Closes issue #6. --- conf.d/sdk.fish | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/conf.d/sdk.fish b/conf.d/sdk.fish index 6b43118..b58c8c1 100644 --- a/conf.d/sdk.fish +++ b/conf.d/sdk.fish @@ -1,11 +1,15 @@ #!/usr/bin/fish -# sdk command -function sdk - bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && sdk $argv" -end +set sdkman_init "$HOME/.sdkman/bin/sdkman-init.sh" -# add paths -for ITEM in $HOME/.sdkman/candidates/* ; - set -gx PATH $PATH $ITEM/current/bin +if test -f "$sdkman_init" + # Add candidate binaries to PATH + for ITEM in $HOME/.sdkman/candidates/* ; + set -gx PATH $PATH $ITEM/current/bin + end + + # Declare the sdk command for fish + function sdk + bash -c "source $sdkman_init && sdk $argv" + end end \ No newline at end of file