mj / zsh-config

Download as
Browse Code ยป

Commit de4644c0f572d8971b4fcf567d6fe5e861392931

Authored by Shrikant Sharat
1 parent 64df9931b5

Install plugins inline now working.

Showing 1 changed file with 10 additions and 1 deletions Inline Diff

1 #!/bin/zsh 1 #!/bin/zsh
2 2
3 # Each line in this string has the following entries separated by a space 3 # Each line in this string has the following entries separated by a space
4 # character. 4 # character.
5 # <bundle-name>, <repo-url>, <plugin-location>, <repo-local-clone-dir> 5 # <bundle-name>, <repo-url>, <plugin-location>, <repo-local-clone-dir>
6 # FIXME: Is not kept local by zsh! 6 # FIXME: Is not kept local by zsh!
7 local bundles="" 7 local bundles=""
8 8
9 # Syntaxes 9 # Syntaxes
10 # bundle <url> [<loc>=/] [<name>] 10 # bundle <url> [<loc>=/] [<name>]
11 bundle () { 11 bundle () {
12 12
13 # Bundle spec arguments' default values. 13 # Bundle spec arguments' default values.
14 local url="$ANTIGEN_DEFAULT_REPO_URL" 14 local url="$ANTIGEN_DEFAULT_REPO_URL"
15 local loc=/ 15 local loc=/
16 local name= 16 local name=
17 local load=true 17 local load=true
18 18
19 # Set spec values based on the positional arguments. 19 # Set spec values based on the positional arguments.
20 local position_args='url loc name' 20 local position_args='url loc name'
21 local i=1 21 local i=1
22 while ! [[ -z $1 || $1 == --*=* ]]; do 22 while ! [[ -z $1 || $1 == --*=* ]]; do
23 arg_name="$(echo "$position_args" | cut -d\ -f$i)" 23 arg_name="$(echo "$position_args" | cut -d\ -f$i)"
24 arg_value="$1" 24 arg_value="$1"
25 eval "local $arg_name='$arg_value'" 25 eval "local $arg_name='$arg_value'"
26 shift 26 shift
27 i=$(($i + 1)) 27 i=$(($i + 1))
28 done 28 done
29 29
30 # Check if url is just the plugin name. Super short syntax. 30 # Check if url is just the plugin name. Super short syntax.
31 if [[ "$url" != */* ]]; then 31 if [[ "$url" != */* ]]; then
32 loc="plugins/$url" 32 loc="plugins/$url"
33 url="$ANTIGEN_DEFAULT_REPO_URL" 33 url="$ANTIGEN_DEFAULT_REPO_URL"
34 fi 34 fi
35 35
36 # Set spec values from keyword arguments, if any. The remaining arguments 36 # Set spec values from keyword arguments, if any. The remaining arguments
37 # are all assumed to be keyword arguments. 37 # are all assumed to be keyword arguments.
38 while [[ $1 == --*=* ]]; do 38 while [[ $1 == --*=* ]]; do
39 arg_name="$(echo "$1" | cut -d= -f1 | sed 's/^--//')" 39 arg_name="$(echo "$1" | cut -d= -f1 | sed 's/^--//')"
40 arg_value="$(echo "$1" | cut -d= -f2)" 40 arg_value="$(echo "$1" | cut -d= -f2)"
41 eval "local $arg_name='$arg_value'" 41 eval "local $arg_name='$arg_value'"
42 shift 42 shift
43 done 43 done
44 44
45 # Resolve the url. 45 # Resolve the url.
46 if [[ $url != git://* && $url != https://* ]]; then 46 if [[ $url != git://* && $url != https://* ]]; then
47 url="${url%.git}" 47 url="${url%.git}"
48 name="$(basename "$url")" 48 name="$(basename "$url")"
49 url="https://github.com/$url.git" 49 url="https://github.com/$url.git"
50 fi 50 fi
51 51
52 # Plugin's repo will be cloned here. 52 # Plugin's repo will be cloned here.
53 local clone_dir="$ANTIGEN_REPO_CACHE/$(echo "$url" \ 53 local clone_dir="$ANTIGEN_REPO_CACHE/$(echo "$url" \
54 | sed -e 's/\.git$//' -e 's./.-SLASH-.g' -e 's.:.-COLON-.g')" 54 | sed -e 's/\.git$//' -e 's./.-SLASH-.g' -e 's.:.-COLON-.g')"
55 55
56 # Make an intelligent guess about the name of the plugin, if not already 56 # Make an intelligent guess about the name of the plugin, if not already
57 # done or is explicitly specified. 57 # done or is explicitly specified.
58 if [[ -z $name ]]; then 58 if [[ -z $name ]]; then
59 name="$(basename $url/$loc)" 59 name="$(basename $url/$loc)"
60 fi 60 fi
61 61
62 # Add it to the record. 62 # Add it to the record.
63 bundles="$bundles\n$name $url $loc $clone_dir" 63 bundles="$bundles\n$name $url $loc $clone_dir"
64 64
65 # Load it, unless specified otherwise. 65 # Load it, unless specified otherwise.
66 if $load; then 66 if $load; then
67 bundle-load "$name" 67 bundle-load "$name"
68 fi 68 fi
69 } 69 }
70 70
71 bundle-install () { 71 bundle-install () {
72 72
73 if [[ $1 == --update ]]; then 73 if [[ $1 == --update ]]; then
74 local update=true 74 local update=true
75 shift 75 shift
76 else 76 else
77 local update=false 77 local update=false
78 fi 78 fi
79 79
80 mkdir -p "$ANTIGEN_BUNDLE_DIR" 80 mkdir -p "$ANTIGEN_BUNDLE_DIR"
81 81
82 local handled_repos="" 82 local handled_repos=""
83 83
84 echo-non-empty "$bundles" | while read spec; do 84 if [[ $# != 0 ]]; then
85 # Record and install just the given plugin here and now.
86 bundle "$@"
87 echo "$bundles" | tail -1
88
89 else
90 # Install all the plugins, previously recorded.
91 echo-non-empty "$bundles"
92
93 fi | while read spec; do
85 echo "-> $spec" 94 echo "-> $spec"
86 95
87 local name="$(echo "$spec" | awk '{print $1}')" 96 local name="$(echo "$spec" | awk '{print $1}')"
88 local url="$(echo "$spec" | awk '{print $2}')" 97 local url="$(echo "$spec" | awk '{print $2}')"
89 local loc="$(echo "$spec" | awk '{print $3}')" 98 local loc="$(echo "$spec" | awk '{print $3}')"
90 local clone_dir="$(echo "$spec" | awk '{print $4}')" 99 local clone_dir="$(echo "$spec" | awk '{print $4}')"
91 100
92 if [[ -z "$(echo "$handled_repos" | grep -Fm1 "$url")" ]]; then 101 if [[ -z "$(echo "$handled_repos" | grep -Fm1 "$url")" ]]; then
93 if [[ ! -d $clone_dir ]]; then 102 if [[ ! -d $clone_dir ]]; then
94 git clone "$url" "$clone_dir" 103 git clone "$url" "$clone_dir"
95 elif $update; then 104 elif $update; then
96 git --git-dir "$clone_dir/.git" pull 105 git --git-dir "$clone_dir/.git" pull
97 fi 106 fi
98 107
99 handled_repos="$handled_repos\n$url" 108 handled_repos="$handled_repos\n$url"
100 fi 109 fi
101 110
102 if [[ $name != *.theme ]]; then 111 if [[ $name != *.theme ]]; then
103 echo Installing $name 112 echo Installing $name
104 local bundle_dest="$ANTIGEN_BUNDLE_DIR/$name" 113 local bundle_dest="$ANTIGEN_BUNDLE_DIR/$name"
105 test -e "$bundle_dest" && rm -rf "$bundle_dest" 114 test -e "$bundle_dest" && rm -rf "$bundle_dest"
106 ln -s "$clone_dir/$loc" "$bundle_dest" 115 ln -s "$clone_dir/$loc" "$bundle_dest"
107 else 116 else
108 mkdir -p "$ANTIGEN_BUNDLE_DIR/$name" 117 mkdir -p "$ANTIGEN_BUNDLE_DIR/$name"
109 cp "$clone_dir/$loc" "$ANTIGEN_BUNDLE_DIR/$name" 118 cp "$clone_dir/$loc" "$ANTIGEN_BUNDLE_DIR/$name"
110 fi 119 fi
111 120
112 bundle-load "$name" 121 bundle-load "$name"
113 122
114 done 123 done
115 124
116 } 125 }
117 126
118 bundle-install! () { 127 bundle-install! () {
119 bundle-install --update 128 bundle-install --update
120 } 129 }
121 130
122 bundle-cleanup () { 131 bundle-cleanup () {
123 132
124 # Find directores in ANTIGEN_BUNDLE_DIR, that are not in the bundles record. 133 # Find directores in ANTIGEN_BUNDLE_DIR, that are not in the bundles record.
125 local unidentified_bundles="$(comm -13 \ 134 local unidentified_bundles="$(comm -13 \
126 <(echo-non-empty "$bundles" | awk '{print $1}' | sort) \ 135 <(echo-non-empty "$bundles" | awk '{print $1}' | sort) \
127 <(ls -1 "$ANTIGEN_BUNDLE_DIR"))" 136 <(ls -1 "$ANTIGEN_BUNDLE_DIR"))"
128 137
129 if [[ -z $unidentified_bundles ]]; then 138 if [[ -z $unidentified_bundles ]]; then
130 echo "You don't have any unidentified bundles." 139 echo "You don't have any unidentified bundles."
131 return 0 140 return 0
132 fi 141 fi
133 142
134 echo The following bundles are not recorded: 143 echo The following bundles are not recorded:
135 echo "$unidentified_bundles" | sed 's/^/ /' 144 echo "$unidentified_bundles" | sed 's/^/ /'
136 145
137 echo -n '\nDelete them all? [y/N] ' 146 echo -n '\nDelete them all? [y/N] '
138 if read -q; then 147 if read -q; then
139 echo 148 echo
140 echo 149 echo
141 echo "$unidentified_bundles" | while read name; do 150 echo "$unidentified_bundles" | while read name; do
142 echo -n Deleting $name... 151 echo -n Deleting $name...
143 rm -rf "$ANTIGEN_BUNDLE_DIR/$name" 152 rm -rf "$ANTIGEN_BUNDLE_DIR/$name"
144 echo ' done.' 153 echo ' done.'
145 done 154 done
146 else 155 else
147 echo 156 echo
148 echo Nothing deleted. 157 echo Nothing deleted.
149 fi 158 fi
150 } 159 }
151 160
152 bundle-load () { 161 bundle-load () {
153 if [[ $1 == --init ]]; then 162 if [[ $1 == --init ]]; then
154 do_init=true 163 do_init=true
155 shift 164 shift
156 else 165 else
157 do_init=false 166 do_init=false
158 fi 167 fi
159 168
160 name="$1" 169 name="$1"
161 bundle_dir="$ANTIGEN_BUNDLE_DIR/$name" 170 bundle_dir="$ANTIGEN_BUNDLE_DIR/$name"
162 171
163 # Source the plugin script 172 # Source the plugin script
164 script_loc="$bundle_dir/$name.plugin.zsh" 173 script_loc="$bundle_dir/$name.plugin.zsh"
165 if [[ -f $script_loc ]]; then 174 if [[ -f $script_loc ]]; then
166 source "$script_loc" 175 source "$script_loc"
167 fi 176 fi
168 177
169 # If the name of the plugin ends with `.lib`, all the *.zsh files in it are 178 # If the name of the plugin ends with `.lib`, all the *.zsh files in it are
170 # sourced. This is kind of a hack to source the libraries of oh-my-zsh. 179 # sourced. This is kind of a hack to source the libraries of oh-my-zsh.
171 if [[ $name == *.lib ]]; then 180 if [[ $name == *.lib ]]; then
172 # FIXME: This throws an error if no files match the given glob pattern. 181 # FIXME: This throws an error if no files match the given glob pattern.
173 for lib ($bundle_dir/*.zsh) source $lib 182 for lib ($bundle_dir/*.zsh) source $lib
174 fi 183 fi
175 184
176 # If the name ends with `.theme`, it is handled as if it were a zsh-theme 185 # If the name ends with `.theme`, it is handled as if it were a zsh-theme
177 # plugin. 186 # plugin.
178 if [[ $name == *.theme ]]; then 187 if [[ $name == *.theme ]]; then
179 source "$bundle_dir/${name%.theme}.zsh-theme" 188 source "$bundle_dir/${name%.theme}.zsh-theme"
180 fi 189 fi
181 190
182 # Add to $fpath, for completion(s) 191 # Add to $fpath, for completion(s)
183 fpath=($bundle_dir $fpath) 192 fpath=($bundle_dir $fpath)
184 193
185 if $do_init; then 194 if $do_init; then
186 bundle-init 195 bundle-init
187 fi 196 fi
188 } 197 }
189 198
190 bundle-lib () { 199 bundle-lib () {
191 bundle --name=oh-my-zsh.lib --loc=lib 200 bundle --name=oh-my-zsh.lib --loc=lib
192 } 201 }
193 202
194 bundle-theme () { 203 bundle-theme () {
195 local url="$ANTIGEN_DEFAULT_REPO_URL" 204 local url="$ANTIGEN_DEFAULT_REPO_URL"
196 local name="${1:-robbyrussell}" 205 local name="${1:-robbyrussell}"
197 bundle "$url" --name=$name.theme --loc=themes/$name.zsh-theme 206 bundle "$url" --name=$name.theme --loc=themes/$name.zsh-theme
198 } 207 }
199 208
200 bundle-apply () { 209 bundle-apply () {
201 # Initialize completion. 210 # Initialize completion.
202 compinit -i 211 compinit -i
203 } 212 }
204 213
205 # Does what it says. 214 # Does what it says.
206 echo-non-empty () { 215 echo-non-empty () {
207 echo "$@" | while read line; do 216 echo "$@" | while read line; do
208 [[ $line != "" ]] && echo $line 217 [[ $line != "" ]] && echo $line
209 done 218 done
210 } 219 }
211 220
212 -bundle-env-setup () { 221 -bundle-env-setup () {
213 # Pre-startup initializations 222 # Pre-startup initializations
214 -set-default ANTIGEN_DEFAULT_REPO_URL \ 223 -set-default ANTIGEN_DEFAULT_REPO_URL \
215 https://github.com/robbyrussell/oh-my-zsh.git 224 https://github.com/robbyrussell/oh-my-zsh.git
216 -set-default ANTIGEN_REPO_CACHE $HOME/.antigen/cache 225 -set-default ANTIGEN_REPO_CACHE $HOME/.antigen/cache
217 -set-default ANTIGEN_BUNDLE_DIR $HOME/.antigen/bundles 226 -set-default ANTIGEN_BUNDLE_DIR $HOME/.antigen/bundles
218 227
219 # Load the compinit module 228 # Load the compinit module
220 autoload -U compinit 229 autoload -U compinit
221 230
222 # Without the following, `compdef` function is not defined. 231 # Without the following, `compdef` function is not defined.
223 compinit -i 232 compinit -i
224 } 233 }
225 234
226 # Same as `export $1=$2`, but will only happen if the name specified by `$1` is 235 # Same as `export $1=$2`, but will only happen if the name specified by `$1` is
227 # not already set. 236 # not already set.
228 -set-default () { 237 -set-default () {
229 arg_name="$1" 238 arg_name="$1"
230 arg_value="$2" 239 arg_value="$2"
231 eval "test -z \"\$$arg_name\" && export $arg_name='$arg_value'" 240 eval "test -z \"\$$arg_name\" && export $arg_name='$arg_value'"
232 } 241 }
233 242
234 -bundle-env-setup 243 -bundle-env-setup
235 244