Browse code
Cleanup output
Showing 2 changed files
... | ... |
@@ -14,7 +14,7 @@ cat <<'EOP' |
14 | 14 |
: |
15 | 15 |
EOP |
16 | 16 |
|
17 |
-echo "begin zshrc" |
|
17 |
+# echo "begin zshrc" |
|
18 | 18 |
echo "shell session started for $USER on $TTY at `date`" | tee /dev/stderr | logger |
19 | 19 |
|
20 | 20 |
source $HOME/.localzshrc.sh |
... | ... |
@@ -108,8 +108,6 @@ alias cvsdiff='cvs diff -wbB | colordiff' |
108 | 108 |
alias cp.="${GNU_PREFIX}cp --target-directory=." |
109 | 109 |
alias find='noglob find' |
110 | 110 |
|
111 |
-echo "done variables and options" |
|
112 |
- |
|
113 | 111 |
showspaces() { |
114 | 112 |
python -c'import sys;print sys.stdin.read().replace(" ","_").replace("\t", "----")' |
115 | 113 |
} |
... | ... |
@@ -266,7 +264,7 @@ bindkey -M viins '^O?' _complete_debug |
266 | 264 |
# detecting the terminal to get the keybindings right |
267 | 265 |
# TODO: check if obsoleted by other things |
268 | 266 |
if [[ -z $BINDKEYS ]]; then |
269 |
- echo 'defining bindkeys in zshrc' |
|
267 |
+ # echo 'defining bindkeys in zshrc' |
|
270 | 268 |
BINDKEYS=${TERM%-256color} |
271 | 269 |
BINDKEYS=${BINDKEYS%-noit} |
272 | 270 |
fi |
... | ... |
@@ -278,7 +276,6 @@ if [[ $BINDKEYS == "screen" ]]; then |
278 | 276 |
bindkey '[1~' beginning-of-line |
279 | 277 |
bindkey '[4~' end-of-line |
280 | 278 |
else |
281 |
- echo foo |
|
282 | 279 |
bindkey -M viins '[1;5D' backward-word |
283 | 280 |
# bindkey '[5D' backward-word |
284 | 281 |
bindkey -M viins '[1;5C' forward-word |
... | ... |
@@ -1,4 +1,6 @@ |
1 | 1 |
#zmodload zsh/zprof |
2 |
+PLUGIN_DIR="$HOME/.zsh.d" |
|
3 |
+ |
|
2 | 4 |
local script_depends loaded_depends |
3 | 5 |
typeset -A script_depends |
4 | 6 |
typeset -A loaded_depends |
... | ... |
@@ -10,7 +12,6 @@ build_depends() { |
10 | 12 |
local -a depends |
11 | 13 |
depends=${(@f)$(get_depends "$1")} |
12 | 14 |
for depend in $depends; do |
13 |
- echo dependency found: $depend |
|
14 | 15 |
script_depends[$1]+="$depend:" |
15 | 16 |
done |
16 | 17 |
} |
... | ... |
@@ -18,38 +19,27 @@ build_depends() { |
18 | 19 |
load_depends() { |
19 | 20 |
for depend in ${(s<:>)script_depends[$1]}; do |
20 | 21 |
if [[ -z $loaded_depends[$depend] ]]; then |
21 |
- local fn="$HOME/.zsh.d/dependencies/$depend.zsh" |
|
22 |
- echo -n "loading dependency $fn ... " |
|
22 |
+ local fn="$PLUGIN_DIR/dependencies/$depend.zsh" |
|
23 | 23 |
if [[ -f $fn ]]; then |
24 | 24 |
if [[ -z $script_depends[$fn] ]]; then |
25 | 25 |
build_depends "$fn" |
26 | 26 |
fi |
27 | 27 |
load_depends "$fn" |
28 | 28 |
source $fn |
29 |
- echo "done." |
|
30 | 29 |
else |
31 |
- echo "missing." |
|
30 |
+ echo "$fn missing for $1" |
|
32 | 31 |
fi |
33 | 32 |
loaded_depends[$depend]=1 |
34 | 33 |
else |
35 |
- echo "dependency $depend already loaded." |
|
36 | 34 |
fi |
37 | 35 |
done |
38 | 36 |
} |
39 | 37 |
|
40 |
-init_scripts=( $HOME/.zsh.d/*.{,z}sh(N) ) |
|
38 |
+init_scripts=( $PLUGIN_DIR/*.{,z}sh(N) ) |
|
41 | 39 |
|
42 | 40 |
PATH="<<<:$PATH:>>>" |
43 |
-echo |
|
44 |
-echo |
|
45 |
-echo |
|
46 | 41 |
for x in $init_scripts; do |
47 |
- echo loading module $x |
|
48 | 42 |
build_depends "$x" |
49 | 43 |
load_depends "$x" |
50 |
- echo loading $x |
|
51 | 44 |
source "$x" |
52 | 45 |
done |
53 |
-echo |
|
54 |
-echo |
|
55 |
-echo |