From b530f01692c65ae560dc83835412d9fa1f025fef Mon Sep 17 00:00:00 2001
From: Jorge Bucaran <mail@jorgebucaran.com>
Date: Thu, 19 May 2016 21:26:07 +0900
Subject: [PATCH] Refactor fisher_cmd_name generation.

---
 fisher.fish | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/fisher.fish b/fisher.fish
index 98bad40..2bcb275 100644
--- a/fisher.fish
+++ b/fisher.fish
@@ -2,12 +2,14 @@ if not set -q fisher_cmd_name
     status --current-filename | command awk '
 
         {
+            cmd = "fisher"
+
             if (n = split($0, parts, "/")) {
                 gsub(/\.fish$/, "", parts[n])
                 print(parts[n])
-            } else {
-                print("fisher")
             }
+
+            print(cmd)
         }
 
     ' | read -gx fisher_cmd_name
@@ -2138,7 +2140,7 @@ function __fisher_self_uninstall -a yn
 
     __fisher_show_spinner
 
-    echo "fisher ls | fisher rm -q" | source ^ /dev/null
+    echo "$fisher_cmd_name ls | $fisher_cmd_name rm -q" | source ^ /dev/null
 
     __fisher_show_spinner