From 2d6965f85645ea489b0adf8ce6a79dd55036d883 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 26 May 2020 17:59:45 +0200
Subject: [PATCH] Fix load of various plugins: fastfile, keychain, sfffe, stack

---
 plugins/fastfile/fastfile.plugin.zsh | 4 ++--
 plugins/keychain/keychain.plugin.zsh | 9 +++------
 plugins/sfffe/sfffe.plugin.zsh       | 6 +++---
 plugins/stack/stack.plugin.zsh       | 2 ++
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/plugins/fastfile/fastfile.plugin.zsh b/plugins/fastfile/fastfile.plugin.zsh
index a4229e4c2..0d71246fc 100644
--- a/plugins/fastfile/fastfile.plugin.zsh
+++ b/plugins/fastfile/fastfile.plugin.zsh
@@ -5,7 +5,7 @@
 # If they are not set yet, they will be
 # overwritten with their default values
 
-default fastfile_dir        "${HOME}/.fastfile/"
+default fastfile_dir        "${HOME}/.fastfile"
 default fastfile_var_prefix "§"
 
 ###########################
@@ -104,7 +104,7 @@ function fastfile_rm() {
 # Generate the aliases for the shortcuts
 #
 function fastfile_sync() {
-    for f in "${fastfile_dir}"/*; do
+    for f in "${fastfile_dir}"/*(N); do
         file=`basename "$f"` # To enable simpler handeling of spaces in file names
         varkey=`echo "$file" | tr " " "_"`
 
diff --git a/plugins/keychain/keychain.plugin.zsh b/plugins/keychain/keychain.plugin.zsh
index 1babf5a30..f122f7982 100644
--- a/plugins/keychain/keychain.plugin.zsh
+++ b/plugins/keychain/keychain.plugin.zsh
@@ -1,7 +1,9 @@
+(( $+commands[keychain] )) || return
+
 # Define SHORT_HOST if not defined (%m = host name up to first .)
 SHORT_HOST=${SHORT_HOST:-${(%):-%m}}
 
-function _start_agent() {
+function {
 	local agents
 	local -a identities
 	local -a options
@@ -28,8 +30,3 @@ function _start_agent() {
 	[ -f "$_keychain_env_sh" ]     && . "$_keychain_env_sh"
 	[ -f "$_keychain_env_sh_gpg" ] && . "$_keychain_env_sh_gpg"
 }
-
-_start_agent
-
-# tidy up after ourselves
-unfunction _start_agent
diff --git a/plugins/sfffe/sfffe.plugin.zsh b/plugins/sfffe/sfffe.plugin.zsh
index a0f034908..177e5fa2f 100644
--- a/plugins/sfffe/sfffe.plugin.zsh
+++ b/plugins/sfffe/sfffe.plugin.zsh
@@ -6,9 +6,9 @@
 #       REQUIRE:  ack
 # ------------------------------------------------------------------------------
 
-if [ ! -x $(which ack) ]; then
-    echo  \'ack\' is not installed!
-    exit -1
+if (( ! $+commands[ack] )); then
+    echo "'ack' is not installed!"
+    return
 fi
 
 ajs() {
diff --git a/plugins/stack/stack.plugin.zsh b/plugins/stack/stack.plugin.zsh
index 4e812880e..45ef38761 100644
--- a/plugins/stack/stack.plugin.zsh
+++ b/plugins/stack/stack.plugin.zsh
@@ -1,2 +1,4 @@
+(( $+commands[stack] )) || return
+
 autoload -U +X bashcompinit && bashcompinit
 source <(stack --bash-completion-script stack)