From 529ea70a2f637cb75d7e8ad7dd764e15d446018c Mon Sep 17 00:00:00 2001
From: Charles Gould <charles@gould.dev>
Date: Fri, 20 Nov 2020 00:08:05 -0600
Subject: [PATCH] fish: bump fisher to v4.1.0

---
 fish/conf.d/fisher.fish         | 10 ++--------
 fish/{fishfile => fish_plugins} |  1 +
 install.sh                      |  1 +
 install/install-fish-plugins.sh |  6 ++++++
 4 files changed, 10 insertions(+), 8 deletions(-)
 rename fish/{fishfile => fish_plugins} (87%)
 create mode 100755 install/install-fish-plugins.sh

diff --git a/fish/conf.d/fisher.fish b/fish/conf.d/fisher.fish
index 7249f30..9074668 100644
--- a/fish/conf.d/fisher.fish
+++ b/fish/conf.d/fisher.fish
@@ -1,13 +1,7 @@
 # https://github.com/jorgebucaran/fisher
-set -g fisher_path ~/.config/fish/fisher
+set -g fisher_path $__fish_config_dir/fisher
 set fish_function_path $fish_function_path[1] $fisher_path/functions $fish_function_path[2..-1]
 set fish_complete_path $fish_complete_path[1] $fisher_path/completions $fish_complete_path[2..-1]
-if not functions -q fisher
-    echo "Installing fish-shell package manager: $fisher_path/functions/fisher.fish"
-    curl -fsSL -o $fisher_path/functions/fisher.fish --create-dirs https://git.io/fisher
-    echo "Installing fish-shell packages..."
-    fish -c fisher
-end
 for file in $fisher_path/conf.d/*.fish
-    builtin source $file 2> /dev/null
+    builtin source $file 2>/dev/null
 end
diff --git a/fish/fishfile b/fish/fish_plugins
similarity index 87%
rename from fish/fishfile
rename to fish/fish_plugins
index babb999..356b225 100644
--- a/fish/fishfile
+++ b/fish/fish_plugins
@@ -1,3 +1,4 @@
+jorgebucaran/fisher
 oh-my-fish/plugin-foreign-env
 oh-my-fish/plugin-license
 oh-my-fish/plugin-sublime
diff --git a/install.sh b/install.sh
index 8f1c55c..6ff786a 100755
--- a/install.sh
+++ b/install.sh
@@ -29,3 +29,4 @@ fi
 confirm "Set login shell?"           && "$ROOTDIR/install/install-shell.sh"
 confirm "Create symlinks?"           && "$ROOTDIR/install/install-symlinks.sh"
 confirm "Install vim plugins?"       && "$ROOTDIR/install/install-vim-plugins.sh"
+confirm "Install fish plugins?"       && "$ROOTDIR/install/install-fish-plugins.sh"
diff --git a/install/install-fish-plugins.sh b/install/install-fish-plugins.sh
new file mode 100755
index 0000000..ccf8cb6
--- /dev/null
+++ b/install/install-fish-plugins.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+echo "To install fish plugins, run this command interactively in fish:"
+echo
+echo "  curl -fsSL https://git.io/fisher | source && fisher update"
+echo