Diff
1diff --git a/plugins/fastfile/fastfile.plugin.zsh b/plugins/fastfile/fastfile.plugin.zsh
2index a4229e4c20733c8d5352a92cd15f277bd6892148..0d71246fcc80f7b694dcafe533d2d76f81c65037 100644
3--- a/plugins/fastfile/fastfile.plugin.zsh
4+++ b/plugins/fastfile/fastfile.plugin.zsh
5@@ -5,7 +5,7 @@
6 # If they are not set yet, they will be
7 # overwritten with their default values
8
9-default fastfile_dir "${HOME}/.fastfile/"
10+default fastfile_dir "${HOME}/.fastfile"
11 default fastfile_var_prefix "§"
12
13 ###########################
14@@ -104,7 +104,7 @@ function fastfile_rm() {
15 # Generate the aliases for the shortcuts
16 #
17 function fastfile_sync() {
18- for f in "${fastfile_dir}"/*; do
19+ for f in "${fastfile_dir}"/*(N); do
20 file=`basename "$f"` # To enable simpler handeling of spaces in file names
21 varkey=`echo "$file" | tr " " "_"`
22
23diff --git a/plugins/keychain/keychain.plugin.zsh b/plugins/keychain/keychain.plugin.zsh
24index 1babf5a309a7283040ce354088c8537a454520e8..f122f79826299d855c37768cc39b701b6428f23b 100644
25--- a/plugins/keychain/keychain.plugin.zsh
26+++ b/plugins/keychain/keychain.plugin.zsh
27@@ -1,7 +1,9 @@
28+(( $+commands[keychain] )) || return
29+
30 # Define SHORT_HOST if not defined (%m = host name up to first .)
31 SHORT_HOST=${SHORT_HOST:-${(%):-%m}}
32
33-function _start_agent() {
34+function {
35 local agents
36 local -a identities
37 local -a options
38@@ -28,8 +30,3 @@ function _start_agent() {
39 [ -f "$_keychain_env_sh" ] && . "$_keychain_env_sh"
40 [ -f "$_keychain_env_sh_gpg" ] && . "$_keychain_env_sh_gpg"
41 }
42-
43-_start_agent
44-
45-# tidy up after ourselves
46-unfunction _start_agent
47diff --git a/plugins/sfffe/sfffe.plugin.zsh b/plugins/sfffe/sfffe.plugin.zsh
48index a0f03490815098f8f91ee7a6d68d55135c38363b..177e5fa2f291ac42527a43a86a7a5caab99e7976 100644
49--- a/plugins/sfffe/sfffe.plugin.zsh
50+++ b/plugins/sfffe/sfffe.plugin.zsh
51@@ -6,9 +6,9 @@
52 # REQUIRE: ack
53 # ------------------------------------------------------------------------------
54
55-if [ ! -x $(which ack) ]; then
56- echo \'ack\' is not installed!
57- exit -1
58+if (( ! $+commands[ack] )); then
59+ echo "'ack' is not installed!"
60+ return
61 fi
62
63 ajs() {
64diff --git a/plugins/stack/stack.plugin.zsh b/plugins/stack/stack.plugin.zsh
65index 4e812880e56ea038be86cc681727855817956039..45ef3876123e32e9b36f58d98225a000931aa67f 100644
66--- a/plugins/stack/stack.plugin.zsh
67+++ b/plugins/stack/stack.plugin.zsh
68@@ -1,2 +1,4 @@
69+(( $+commands[stack] )) || return
70+
71 autoload -U +X bashcompinit && bashcompinit
72 source <(stack --bash-completion-script stack)