git.fiddlerwoaroof.com
Browse code

Fix zshrc dependency resolution

Ed Langley authored on 22/02/2018 02:12:09
Showing 1 changed files
... ...
@@ -2,12 +2,12 @@
2 2
 #zmodload zsh/zprof
3 3
 
4 4
 if [[ "$TERM" == "dumb" ]]; then
5
-  unsetopt zle
6
-  unsetopt prompt_cr
7
-  unsetopt prompt_subst
8
-  unfunction precmd
9
-  unfunction preexec
10
-  PS1='$ '
5
+    unsetopt zle
6
+    unsetopt prompt_cr
7
+    unsetopt prompt_subst
8
+    unfunction precmd
9
+    unfunction preexec
10
+    PS1='$ '
11 11
 else 
12 12
   PLUGIN_DIR="${PLUGIN_DIR:-$HOME/.zsh.d}"
13 13
 
... ...
@@ -29,17 +29,17 @@ else
29 29
   load_depends() {
30 30
     for depend in ${(s<:>)script_depends[$1]}; do
31 31
       if [[ -z $loaded_depends[$depend] ]]; then
32
-        local fn="$PLUGIN_DIR/dependencies/$depend.zsh"
33
-        if [[ -f $fn ]]; then
34
-          if [[ -z $script_depends[$fn] ]]; then
35
-            build_depends "$fn"
32
+          loaded_depends[$depend]=1
33
+          local fn="$PLUGIN_DIR/dependencies/$depend.zsh"
34
+          if [[ -f $fn ]]; then
35
+              if [[ -z $script_depends[$fn] ]]; then
36
+                  build_depends "$fn"
37
+              fi
38
+              load_depends "$fn"
39
+              source $fn
40
+          else
41
+            echo "$fn missing for $1"
36 42
           fi
37
-          load_depends "$fn"
38
-          source $fn
39
-        else
40
-          echo "$fn missing for $1"
41
-        fi
42
-        loaded_depends[$depend]=1
43 43
       else
44 44
       fi
45 45
     done