From 8a14b1d5708add1c6c0a2ce7e7a10c2bd4e61dd0 Mon Sep 17 00:00:00 2001
From: Raphael Reitzig <4246780+reitzig@users.noreply.github.com>
Date: Thu, 19 Jul 2018 01:19:05 +0200
Subject: [PATCH] Refactoring: Define sdkman-init variable only once and "hide"
 it.

Also nicer test output.
---
 conf.d/sdk.fish    | 6 +++---
 functions/sdk.fish | 6 ++----
 test/wrapper.fish  | 5 +++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/conf.d/sdk.fish b/conf.d/sdk.fish
index 71ee809..703b7f6 100644
--- a/conf.d/sdk.fish
+++ b/conf.d/sdk.fish
@@ -7,10 +7,10 @@
 # MIT License (MIT)
 # https://github.com/reitzig/sdkman-for-fish
 
-set sdkman_init "$HOME/.sdkman/bin/sdkman-init.sh"
+set __fish_sdkman_init "$HOME/.sdkman/bin/sdkman-init.sh"
 
 # Guard: SDKMAN! needs to be installed
-if not test -f "$sdkman_init"
+if not test -f "$__fish_sdkman_init"
     exit 0
 end
 
@@ -64,6 +64,6 @@ end
 # If this is a subshell of a(n initialized) fish, no initialization
 # necessary. Otherwise:
 if not set -q SDKMAN_DIR
-    __fish_sdkman_run_in_bash "source $sdkman_init"
+    __fish_sdkman_run_in_bash "source $__fish_sdkman_init"
 end
 
diff --git a/functions/sdk.fish b/functions/sdk.fish
index 5a65e50..da9da88 100644
--- a/functions/sdk.fish
+++ b/functions/sdk.fish
@@ -1,11 +1,9 @@
-set sdkman_init "$HOME/.sdkman/bin/sdkman-init.sh"
-
 # Guard: SDKMAN! needs to be installed
-if not test -f "$sdkman_init"
+if not test -f "$__fish_sdkman_init"
   exit 0
 end
 
 # Declare the sdk command for fish
 function sdk -d "Manage SDKs"
-    __fish_sdkman_run_in_bash "source $sdkman_init && sdk $argv"
+    __fish_sdkman_run_in_bash "source $__fish_sdkman_init && sdk $argv"
 end
\ No newline at end of file
diff --git a/test/wrapper.fish b/test/wrapper.fish
index 4979cf4..a48e822 100644
--- a/test/wrapper.fish
+++ b/test/wrapper.fish
@@ -25,8 +25,9 @@ for sdk_cmd in $test_commands
     bash -c "source \"$sdk_init\" && $sdk_cmd > sout_bash; echo \"\$?\" > status_bash; echo "\$PATH" > path_bash"
     fish -c "$sdk_cmd > sout_fish; echo \"\$status\" > status_fish; echo "\$PATH" > path_fish"
 
-    # Adjust for different path syntax: replace spaces with colons
-    string join : (string split " " (cat path_fish)) > path_fish
+    # For nicer diffs: one entry per line, sorted
+    string split ":" (cat path_bash) | sort > path_bash
+    string split " " (cat path_fish) | sort > path_fish
 
     for out in sout status path
         if [ (checksum "$out"_bash) != (checksum "$out"_fish) ]