mj / zsh-config

Download as
Browse Code ยป

Commit 387fbc4d4baf138e29c8470020c854c11242a875

Authored by Shrikant Sharat
1 parent ca730285cd

Internalize library loading functions.

Showing 1 changed file with 8 additions and 4 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 # <repo-url>, <plugin-location>, <bundle-type>, <has-local-clone> 5 # <repo-url>, <plugin-location>, <bundle-type>, <has-local-clone>
6 # FIXME: Is not kept local by zsh! 6 # FIXME: Is not kept local by zsh!
7 local _ANTIGEN_BUNDLE_RECORD="" 7 local _ANTIGEN_BUNDLE_RECORD=""
8 local _ANTIGEN_INSTALL_DIR="$(cd "$(dirname "$0")" && pwd)" 8 local _ANTIGEN_INSTALL_DIR="$(cd "$(dirname "$0")" && pwd)"
9 9
10 # Used to defer compinit/compdef 10 # Used to defer compinit/compdef
11 typeset -a __deferred_compdefs 11 typeset -a __deferred_compdefs
12 compdef () { __deferred_compdefs=($__deferred_compdefs "$*") } 12 compdef () { __deferred_compdefs=($__deferred_compdefs "$*") }
13 13
14 # Syntaxes 14 # Syntaxes
15 # antigen-bundle <url> [<loc>=/] 15 # antigen-bundle <url> [<loc>=/]
16 # Keyword only arguments: 16 # Keyword only arguments:
17 # branch - The branch of the repo to use for this bundle. 17 # branch - The branch of the repo to use for this bundle.
18 antigen-bundle () { 18 antigen-bundle () {
19 19
20 # Bundle spec arguments' default values. 20 # Bundle spec arguments' default values.
21 local url="$ANTIGEN_DEFAULT_REPO_URL" 21 local url="$ANTIGEN_DEFAULT_REPO_URL"
22 local loc=/ 22 local loc=/
23 local branch= 23 local branch=
24 local no_local_clone=false 24 local no_local_clone=false
25 local btype=plugin 25 local btype=plugin
26 26
27 # Parse the given arguments. (Will overwrite the above values). 27 # Parse the given arguments. (Will overwrite the above values).
28 eval "$(-antigen-parse-args \ 28 eval "$(-antigen-parse-args \
29 'url?, loc? ; branch:?, no-local-clone?, btype:?' \ 29 'url?, loc? ; branch:?, no-local-clone?, btype:?' \
30 "$@")" 30 "$@")"
31 31
32 # Check if url is just the plugin name. Super short syntax. 32 # Check if url is just the plugin name. Super short syntax.
33 if [[ "$url" != */* ]]; then 33 if [[ "$url" != */* ]]; then
34 loc="plugins/$url" 34 loc="plugins/$url"
35 url="$ANTIGEN_DEFAULT_REPO_URL" 35 url="$ANTIGEN_DEFAULT_REPO_URL"
36 fi 36 fi
37 37
38 # Resolve the url. 38 # Resolve the url.
39 url="$(-antigen-resolve-bundle-url "$url")" 39 url="$(-antigen-resolve-bundle-url "$url")"
40 40
41 # Add the branch information to the url. 41 # Add the branch information to the url.
42 if [[ ! -z $branch ]]; then 42 if [[ ! -z $branch ]]; then
43 url="$url|$branch" 43 url="$url|$branch"
44 fi 44 fi
45 45
46 # The `make_local_clone` variable better represents whether there should be 46 # The `make_local_clone` variable better represents whether there should be
47 # a local clone made. For cloning to be avoided, firstly, the `$url` should 47 # a local clone made. For cloning to be avoided, firstly, the `$url` should
48 # be an absolute local path and `$branch` should be empty. In addition to 48 # be an absolute local path and `$branch` should be empty. In addition to
49 # these two conditions, either the `--no-local-clone` option should be 49 # these two conditions, either the `--no-local-clone` option should be
50 # given, or `$url` should not a git repo. 50 # given, or `$url` should not a git repo.
51 local make_local_clone=true 51 local make_local_clone=true
52 if [[ $url == /* && -z $branch && 52 if [[ $url == /* && -z $branch &&
53 ( $no_local_clone == true || ! -d $url/.git ) ]]; then 53 ( $no_local_clone == true || ! -d $url/.git ) ]]; then
54 make_local_clone=false 54 make_local_clone=false
55 fi 55 fi
56 56
57 # Add the theme extension to `loc`, if this is a theme. 57 # Add the theme extension to `loc`, if this is a theme.
58 if [[ $btype == theme && $loc != *.zsh-theme ]]; then 58 if [[ $btype == theme && $loc != *.zsh-theme ]]; then
59 loc="$loc.zsh-theme" 59 loc="$loc.zsh-theme"
60 fi 60 fi
61 61
62 # Add it to the record. 62 # Add it to the record.
63 _ANTIGEN_BUNDLE_RECORD="$_ANTIGEN_BUNDLE_RECORD\n$url $loc $btype" 63 _ANTIGEN_BUNDLE_RECORD="$_ANTIGEN_BUNDLE_RECORD\n$url $loc $btype"
64 _ANTIGEN_BUNDLE_RECORD="$_ANTIGEN_BUNDLE_RECORD $make_local_clone" 64 _ANTIGEN_BUNDLE_RECORD="$_ANTIGEN_BUNDLE_RECORD $make_local_clone"
65 65
66 # Ensure a clone exists for this repo, if needed. 66 # Ensure a clone exists for this repo, if needed.
67 if $make_local_clone; then 67 if $make_local_clone; then
68 -antigen-ensure-repo "$url" 68 -antigen-ensure-repo "$url"
69 fi 69 fi
70 70
71 # Load the plugin. 71 # Load the plugin.
72 -antigen-load "$url" "$loc" "$btype" "$make_local_clone" 72 -antigen-load "$url" "$loc" "$btype" "$make_local_clone"
73 73
74 } 74 }
75 75
76 -antigen-resolve-bundle-url () { 76 -antigen-resolve-bundle-url () {
77 # Given an acceptable short/full form of a bundle's repo url, this function 77 # Given an acceptable short/full form of a bundle's repo url, this function
78 # echoes the full form of the repo's clone url. 78 # echoes the full form of the repo's clone url.
79 79
80 local url="$1" 80 local url="$1"
81 81
82 # Expand short github url syntax: `username/reponame`. 82 # Expand short github url syntax: `username/reponame`.
83 if [[ $url != git://* && 83 if [[ $url != git://* &&
84 $url != https://* && 84 $url != https://* &&
85 $url != /* && 85 $url != /* &&
86 $url != git@github.com:*/* 86 $url != git@github.com:*/*
87 ]]; then 87 ]]; then
88 url="https://github.com/${url%.git}.git" 88 url="https://github.com/${url%.git}.git"
89 fi 89 fi
90 90
91 echo "$url" 91 echo "$url"
92 } 92 }
93 93
94 antigen-bundles () { 94 antigen-bundles () {
95 # Bulk add many bundles at one go. Empty lines and lines starting with a `#` 95 # Bulk add many bundles at one go. Empty lines and lines starting with a `#`
96 # are ignored. Everything else is given to `antigen-bundle` as is, no 96 # are ignored. Everything else is given to `antigen-bundle` as is, no
97 # quoting rules applied. 97 # quoting rules applied.
98 98
99 local line 99 local line
100 100
101 grep '^[[:space:]]*[^[:space:]#]' | while read line; do 101 grep '^[[:space:]]*[^[:space:]#]' | while read line; do
102 # Using `eval` so that we can use the shell-style quoting in each line 102 # Using `eval` so that we can use the shell-style quoting in each line
103 # piped to `antigen-bundles`. 103 # piped to `antigen-bundles`.
104 eval "antigen-bundle $line" 104 eval "antigen-bundle $line"
105 done 105 done
106 } 106 }
107 107
108 antigen-update () { 108 antigen-update () {
109 # Update your bundles, i.e., `git pull` in all the plugin repos. 109 # Update your bundles, i.e., `git pull` in all the plugin repos.
110 110
111 date > $ADOTDIR/revert-info 111 date > $ADOTDIR/revert-info
112 112
113 -antigen-echo-record | 113 -antigen-echo-record |
114 awk '$4 == "true" {print $1}' | 114 awk '$4 == "true" {print $1}' |
115 sort -u | 115 sort -u |
116 while read url; do 116 while read url; do
117 echo "**** Pulling $url" 117 echo "**** Pulling $url"
118 118
119 local clone_dir="$(-antigen-get-clone-dir "$url")" 119 local clone_dir="$(-antigen-get-clone-dir "$url")"
120 if [[ -d "$clone_dir" ]]; then 120 if [[ -d "$clone_dir" ]]; then
121 (echo -n "$clone_dir:" 121 (echo -n "$clone_dir:"
122 cd "$clone_dir" 122 cd "$clone_dir"
123 git rev-parse HEAD) >> $ADOTDIR/revert-info 123 git rev-parse HEAD) >> $ADOTDIR/revert-info
124 fi 124 fi
125 125
126 -antigen-ensure-repo "$url" --update --verbose 126 -antigen-ensure-repo "$url" --update --verbose
127 127
128 echo 128 echo
129 done 129 done
130 } 130 }
131 131
132 antigen-revert () { 132 antigen-revert () {
133 if [[ -f $ADOTDIR/revert-info ]]; then 133 if [[ -f $ADOTDIR/revert-info ]]; then
134 cat $ADOTDIR/revert-info | sed '1!p' | while read line; do 134 cat $ADOTDIR/revert-info | sed '1!p' | while read line; do
135 dir="$(echo "$line" | cut -d: -f1)" 135 dir="$(echo "$line" | cut -d: -f1)"
136 git --git-dir="$dir/.git" --work-tree="$dir" \ 136 git --git-dir="$dir/.git" --work-tree="$dir" \
137 checkout "$(echo "$line" | cut -d: -f2)" 2> /dev/null 137 checkout "$(echo "$line" | cut -d: -f2)" 2> /dev/null
138 138
139 done 139 done
140 140
141 echo "Reverted to state before running -update on $( 141 echo "Reverted to state before running -update on $(
142 cat $ADOTDIR/revert-info | sed -n 1p)." 142 cat $ADOTDIR/revert-info | sed -n 1p)."
143 143
144 else 144 else
145 echo 'No revert information available. Cannot revert.' >&2 145 echo 'No revert information available. Cannot revert.' >&2
146 fi 146 fi
147 147
148 148
149 } 149 }
150 150
151 -antigen-get-clone-dir () { 151 -antigen-get-clone-dir () {
152 # Takes a repo url and gives out the path that this url needs to be cloned 152 # Takes a repo url and gives out the path that this url needs to be cloned
153 # to. Doesn't actually clone anything. 153 # to. Doesn't actually clone anything.
154 echo -n $ADOTDIR/repos/ 154 echo -n $ADOTDIR/repos/
155 155
156 if [[ "$1" == "https://github.com/sorin-ionescu/prezto.git" ]]; then 156 if [[ "$1" == "https://github.com/sorin-ionescu/prezto.git" ]]; then
157 # Prezto's directory *has* to be `.zprezto`. 157 # Prezto's directory *has* to be `.zprezto`.
158 echo .zprezto 158 echo .zprezto
159 159
160 else 160 else
161 echo "$1" | sed \ 161 echo "$1" | sed \
162 -e 's./.-SLASH-.g' \ 162 -e 's./.-SLASH-.g' \
163 -e 's.:.-COLON-.g' \ 163 -e 's.:.-COLON-.g' \
164 -e 's.|.-PIPE-.g' 164 -e 's.|.-PIPE-.g'
165 165
166 fi 166 fi
167 } 167 }
168 168
169 -antigen-get-clone-url () { 169 -antigen-get-clone-url () {
170 # Takes a repo's clone dir and gives out the repo's original url that was 170 # Takes a repo's clone dir and gives out the repo's original url that was
171 # used to create the given directory path. 171 # used to create the given directory path.
172 172
173 if [[ "$1" == ".zprezto" ]]; then 173 if [[ "$1" == ".zprezto" ]]; then
174 # Prezto's (in `.zprezto`), is assumed to be from `sorin-ionescu`'s 174 # Prezto's (in `.zprezto`), is assumed to be from `sorin-ionescu`'s
175 # remote. 175 # remote.
176 echo https://github.com/sorin-ionescu/prezto.git 176 echo https://github.com/sorin-ionescu/prezto.git
177 177
178 else 178 else
179 echo "$1" | sed \ 179 echo "$1" | sed \
180 -e "s:^$ADOTDIR/repos/::" \ 180 -e "s:^$ADOTDIR/repos/::" \
181 -e 's.-SLASH-./.g' \ 181 -e 's.-SLASH-./.g' \
182 -e 's.-COLON-.:.g' \ 182 -e 's.-COLON-.:.g' \
183 -e 's.-PIPE-.|.g' 183 -e 's.-PIPE-.|.g'
184 184
185 fi 185 fi
186 } 186 }
187 187
188 -antigen-ensure-repo () { 188 -antigen-ensure-repo () {
189 189
190 # Ensure that a clone exists for the given repo url and branch. If the first 190 # Ensure that a clone exists for the given repo url and branch. If the first
191 # argument is `--update` and if a clone already exists for the given repo 191 # argument is `--update` and if a clone already exists for the given repo
192 # and branch, it is pull-ed, i.e., updated. 192 # and branch, it is pull-ed, i.e., updated.
193 193
194 # Argument defaults. 194 # Argument defaults.
195 # The url. No sane default for this, so just empty. 195 # The url. No sane default for this, so just empty.
196 local url= 196 local url=
197 # Check if we have to update. 197 # Check if we have to update.
198 local update=false 198 local update=false
199 # Verbose output. 199 # Verbose output.
200 local verbose=false 200 local verbose=false
201 201
202 eval "$(-antigen-parse-args 'url ; update?, verbose?' "$@")" 202 eval "$(-antigen-parse-args 'url ; update?, verbose?' "$@")"
203 shift $# 203 shift $#
204 204
205 # Get the clone's directory as per the given repo url and branch. 205 # Get the clone's directory as per the given repo url and branch.
206 local clone_dir="$(-antigen-get-clone-dir $url)" 206 local clone_dir="$(-antigen-get-clone-dir $url)"
207 207
208 # A temporary function wrapping the `git` command with repeated arguments. 208 # A temporary function wrapping the `git` command with repeated arguments.
209 --plugin-git () { 209 --plugin-git () {
210 (cd "$clone_dir" && git --no-pager "$@") 210 (cd "$clone_dir" && git --no-pager "$@")
211 } 211 }
212 212
213 # Clone if it doesn't already exist. 213 # Clone if it doesn't already exist.
214 if [[ ! -d $clone_dir ]]; then 214 if [[ ! -d $clone_dir ]]; then
215 git clone --recursive "${url%|*}" "$clone_dir" 215 git clone --recursive "${url%|*}" "$clone_dir"
216 elif $update; then 216 elif $update; then
217 # Save current revision. 217 # Save current revision.
218 local old_rev="$(--plugin-git rev-parse HEAD)" 218 local old_rev="$(--plugin-git rev-parse HEAD)"
219 # Pull changes if update requested. 219 # Pull changes if update requested.
220 --plugin-git pull 220 --plugin-git pull
221 # Update submodules. 221 # Update submodules.
222 --plugin-git submodule update --recursive 222 --plugin-git submodule update --recursive
223 # Get the new revision. 223 # Get the new revision.
224 local new_rev="$(--plugin-git rev-parse HEAD)" 224 local new_rev="$(--plugin-git rev-parse HEAD)"
225 fi 225 fi
226 226
227 # If its a specific branch that we want, checkout that branch. 227 # If its a specific branch that we want, checkout that branch.
228 if [[ $url == *\|* ]]; then 228 if [[ $url == *\|* ]]; then
229 local current_branch=${$(--plugin-git symbolic-ref HEAD)##refs/heads/} 229 local current_branch=${$(--plugin-git symbolic-ref HEAD)##refs/heads/}
230 local requested_branch="${url#*|}" 230 local requested_branch="${url#*|}"
231 # Only do the checkout when we are not already on the branch. 231 # Only do the checkout when we are not already on the branch.
232 [[ $requested_branch != $current_branch ]] && 232 [[ $requested_branch != $current_branch ]] &&
233 --plugin-git checkout $requested_branch 233 --plugin-git checkout $requested_branch
234 fi 234 fi
235 235
236 if [[ -n $old_rev && $old_rev != $new_rev ]]; then 236 if [[ -n $old_rev && $old_rev != $new_rev ]]; then
237 echo Updated from ${old_rev:0:7} to ${new_rev:0:7}. 237 echo Updated from ${old_rev:0:7} to ${new_rev:0:7}.
238 if $verbose; then 238 if $verbose; then
239 --plugin-git log --oneline --reverse --no-merges --stat '@{1}..' 239 --plugin-git log --oneline --reverse --no-merges --stat '@{1}..'
240 fi 240 fi
241 fi 241 fi
242 242
243 # Remove the temporary git wrapper function. 243 # Remove the temporary git wrapper function.
244 unfunction -- --plugin-git 244 unfunction -- --plugin-git
245 245
246 } 246 }
247 247
248 -antigen-load () { 248 -antigen-load () {
249 249
250 local url="$1" 250 local url="$1"
251 local loc="$2" 251 local loc="$2"
252 local btype="$3" 252 local btype="$3"
253 local make_local_clone="$4" 253 local make_local_clone="$4"
254 254
255 # The full location where the plugin is located. 255 # The full location where the plugin is located.
256 local location 256 local location
257 if $make_local_clone; then 257 if $make_local_clone; then
258 location="$(-antigen-get-clone-dir "$url")/$loc" 258 location="$(-antigen-get-clone-dir "$url")/$loc"
259 else 259 else
260 location="$url" 260 location="$url"
261 fi 261 fi
262 262
263 if [[ $btype == theme ]]; then 263 if [[ $btype == theme ]]; then
264 264
265 # Of course, if its a theme, the location would point to the script 265 # Of course, if its a theme, the location would point to the script
266 # file. 266 # file.
267 source "$location" 267 source "$location"
268 268
269 else 269 else
270 270
271 # Source the plugin script. 271 # Source the plugin script.
272 # FIXME: I don't know. Looks very very ugly. Needs a better 272 # FIXME: I don't know. Looks very very ugly. Needs a better
273 # implementation once tests are ready. 273 # implementation once tests are ready.
274 local script_loc="$(ls "$location" | grep -m1 '\.plugin\.zsh$')" 274 local script_loc="$(ls "$location" | grep -m1 '\.plugin\.zsh$')"
275 275
276 if [[ -f $location/$script_loc ]]; then 276 if [[ -f $location/$script_loc ]]; then
277 # If we have a `*.plugin.zsh`, source it. 277 # If we have a `*.plugin.zsh`, source it.
278 source "$location/$script_loc" 278 source "$location/$script_loc"
279 279
280 elif [[ -f $location/init.zsh ]]; then 280 elif [[ -f $location/init.zsh ]]; then
281 # If we have a `init.zsh` 281 # If we have a `init.zsh`
282 if (( $+functions[pmodload] )); then 282 if (( $+functions[pmodload] )); then
283 # If pmodload is defined pmodload the module. Remove `modules/` 283 # If pmodload is defined pmodload the module. Remove `modules/`
284 # from loc to find module name. 284 # from loc to find module name.
285 pmodload "${loc#modules/}" 285 pmodload "${loc#modules/}"
286 else 286 else
287 # Otherwise source it. 287 # Otherwise source it.
288 source "$location/init.zsh" 288 source "$location/init.zsh"
289 fi 289 fi
290 290
291 elif ls "$location" | grep -qm1 '\.zsh$'; then 291 elif ls "$location" | grep -qm1 '\.zsh$'; then
292 # If there is no `*.plugin.zsh` file, source *all* the `*.zsh` 292 # If there is no `*.plugin.zsh` file, source *all* the `*.zsh`
293 # files. 293 # files.
294 for script ($location/*.zsh(N)) source "$script" 294 for script ($location/*.zsh(N)) source "$script"
295 295
296 elif ls "$location" | grep -qm1 '\.sh$'; then 296 elif ls "$location" | grep -qm1 '\.sh$'; then
297 # If there are no `*.zsh` files either, we look for and source any 297 # If there are no `*.zsh` files either, we look for and source any
298 # `*.sh` files instead. 298 # `*.sh` files instead.
299 for script ($location/*.sh(N)) source "$script" 299 for script ($location/*.sh(N)) source "$script"
300 300
301 fi 301 fi
302 302
303 # Add to $fpath, for completion(s). 303 # Add to $fpath, for completion(s).
304 fpath=($location $fpath) 304 fpath=($location $fpath)
305 305
306 fi 306 fi
307 307
308 } 308 }
309 309
310 # Update (with `git pull`) antigen itself. 310 # Update (with `git pull`) antigen itself.
311 # TODO: Once update is finished, show a summary of the new commits, as a kind of 311 # TODO: Once update is finished, show a summary of the new commits, as a kind of
312 # "what's new" message. 312 # "what's new" message.
313 antigen-selfupdate () { 313 antigen-selfupdate () {
314 ( cd $_ANTIGEN_INSTALL_DIR 314 ( cd $_ANTIGEN_INSTALL_DIR
315 if [[ ! -d .git ]]; then 315 if [[ ! -d .git ]]; then
316 echo "Your copy of antigen doesn't appear to be a git clone. " \ 316 echo "Your copy of antigen doesn't appear to be a git clone. " \
317 "The 'selfupdate' command cannot work in this case." 317 "The 'selfupdate' command cannot work in this case."
318 return 1 318 return 1
319 fi 319 fi
320 git pull 320 git pull
321 ) 321 )
322 } 322 }
323 323
324 antigen-cleanup () { 324 antigen-cleanup () {
325 325
326 # Cleanup unused repositories. 326 # Cleanup unused repositories.
327 327
328 local force=false 328 local force=false
329 if [[ $1 == --force ]]; then 329 if [[ $1 == --force ]]; then
330 force=true 330 force=true
331 fi 331 fi
332 332
333 if [[ ! -d "$ADOTDIR/repos" || -z "$(ls "$ADOTDIR/repos/")" ]]; then 333 if [[ ! -d "$ADOTDIR/repos" || -z "$(ls "$ADOTDIR/repos/")" ]]; then
334 echo "You don't have any bundles." 334 echo "You don't have any bundles."
335 return 0 335 return 0
336 fi 336 fi
337 337
338 # Find directores in ADOTDIR/repos, that are not in the bundles record. 338 # Find directores in ADOTDIR/repos, that are not in the bundles record.
339 local unused_clones="$(comm -13 \ 339 local unused_clones="$(comm -13 \
340 <(-antigen-echo-record | 340 <(-antigen-echo-record |
341 awk '$4 == "true" {print $1}' | 341 awk '$4 == "true" {print $1}' |
342 while read line; do 342 while read line; do
343 -antigen-get-clone-dir "$line" 343 -antigen-get-clone-dir "$line"
344 done | 344 done |
345 sort -u) \ 345 sort -u) \
346 <(ls -d "$ADOTDIR/repos/"* | sort -u))" 346 <(ls -d "$ADOTDIR/repos/"* | sort -u))"
347 347
348 if [[ -z $unused_clones ]]; then 348 if [[ -z $unused_clones ]]; then
349 echo "You don't have any unidentified bundles." 349 echo "You don't have any unidentified bundles."
350 return 0 350 return 0
351 fi 351 fi
352 352
353 echo 'You have clones for the following repos, but are not used.' 353 echo 'You have clones for the following repos, but are not used.'
354 echo "$unused_clones" | 354 echo "$unused_clones" |
355 while read line; do 355 while read line; do
356 -antigen-get-clone-url "$line" 356 -antigen-get-clone-url "$line"
357 done | 357 done |
358 sed -e 's/^/ /' -e 's/|/, branch /' 358 sed -e 's/^/ /' -e 's/|/, branch /'
359 359
360 if $force || (echo -n '\nDelete them all? [y/N] '; read -q); then 360 if $force || (echo -n '\nDelete them all? [y/N] '; read -q); then
361 echo 361 echo
362 echo 362 echo
363 echo "$unused_clones" | while read line; do 363 echo "$unused_clones" | while read line; do
364 echo -n "Deleting clone for $(-antigen-get-clone-url "$line")..." 364 echo -n "Deleting clone for $(-antigen-get-clone-url "$line")..."
365 rm -rf "$line" 365 rm -rf "$line"
366 echo ' done.' 366 echo ' done.'
367 done 367 done
368 else 368 else
369 echo 369 echo
370 echo Nothing deleted. 370 echo Nothing deleted.
371 fi 371 fi
372 } 372 }
373 373
374 antigen-use () { 374 antigen-use () {
375 if [[ $1 == oh-my-zsh ]]; then 375 if [[ $1 == oh-my-zsh ]]; then
376 antigen-lib $@ 376 -antigen-use-oh-my-zsh
377 elif [[ $1 == prezto ]]; then 377 elif [[ $1 == prezto ]]; then
378 antigen-prezto-lib $@ 378 -antigen-use-prezto
379 else 379 else
380 echo 'Usage: antigen-use <library-name>' >&2 380 echo 'Usage: antigen-use <library-name>' >&2
381 echo 'Where <library-name> is any one of the following:' >&2 381 echo 'Where <library-name> is any one of the following:' >&2
382 echo ' * oh-my-zsh' >&2 382 echo ' * oh-my-zsh' >&2
383 echo ' * prezto' >&2 383 echo ' * prezto' >&2
384 return 1 384 return 1
385 fi 385 fi
386 } 386 }
387 387
388 antigen-lib () { 388 -antigen-use-oh-my-zsh () {
389 if [[ -z "$ZSH" ]]; then 389 if [[ -z "$ZSH" ]]; then
390 export ZSH="$(-antigen-get-clone-dir "$ANTIGEN_DEFAULT_REPO_URL")" 390 export ZSH="$(-antigen-get-clone-dir "$ANTIGEN_DEFAULT_REPO_URL")"
391 fi 391 fi
392 antigen-bundle --loc=lib 392 antigen-bundle --loc=lib
393 } 393 }
394 394
395 antigen-prezto-lib () { 395 -antigen-use-prezto () {
396 antigen-bundle sorin-ionescu/prezto 396 antigen-bundle sorin-ionescu/prezto
397 export ZDOTDIR=$ADOTDIR/repos/ 397 export ZDOTDIR=$ADOTDIR/repos/
398 } 398 }
399 399
400 # For backwards compatibility.
401 antigen-lib () { -antigen-use-oh-my-zsh }
402 antigen-prezto-lib () { -antigen-use-prezto }
403
400 antigen-theme () { 404 antigen-theme () {
401 405
402 if [[ "$1" != */* && "$1" != --* ]]; then 406 if [[ "$1" != */* && "$1" != --* ]]; then
403 # The first argument is just a name of the plugin, to be picked up from 407 # The first argument is just a name of the plugin, to be picked up from
404 # the default repo. 408 # the default repo.
405 local name="${1:-robbyrussell}" 409 local name="${1:-robbyrussell}"
406 antigen-bundle --loc=themes/$name --btype=theme 410 antigen-bundle --loc=themes/$name --btype=theme
407 411
408 else 412 else
409 antigen-bundle "$@" --btype=theme 413 antigen-bundle "$@" --btype=theme
410 414
411 fi 415 fi
412 416
413 } 417 }
414 418
415 antigen-apply () { 419 antigen-apply () {
416 420
417 # Initialize completion. 421 # Initialize completion.
418 local cdef 422 local cdef
419 423
420 # Load the compinit module. This will readefine the `compdef` function to 424 # Load the compinit module. This will readefine the `compdef` function to
421 # the one that actually initializes completions. 425 # the one that actually initializes completions.
422 autoload -U compinit 426 autoload -U compinit
423 compinit -i 427 compinit -i
424 428
425 # Apply all `compinit`s that have been deferred. 429 # Apply all `compinit`s that have been deferred.
426 eval "$(for cdef in $__deferred_compdefs; do 430 eval "$(for cdef in $__deferred_compdefs; do
427 echo compdef $cdef 431 echo compdef $cdef
428 done)" 432 done)"
429 433
430 unset __deferred_compdefs 434 unset __deferred_compdefs
431 435
432 } 436 }
433 437
434 antigen-list () { 438 antigen-list () {
435 # List all currently installed bundles. 439 # List all currently installed bundles.
436 if [[ -z "$_ANTIGEN_BUNDLE_RECORD" ]]; then 440 if [[ -z "$_ANTIGEN_BUNDLE_RECORD" ]]; then
437 echo "You don't have any bundles." >&2 441 echo "You don't have any bundles." >&2
438 return 1 442 return 1
439 else 443 else
440 -antigen-echo-record | sort -u 444 -antigen-echo-record | sort -u
441 fi 445 fi
442 } 446 }
443 447
444 antigen-snapshot () { 448 antigen-snapshot () {
445 449
446 local snapshot_file="${1:-antigen-shapshot}" 450 local snapshot_file="${1:-antigen-shapshot}"
447 451
448 # The snapshot content lines are pairs of repo-url and git version hash, in 452 # The snapshot content lines are pairs of repo-url and git version hash, in
449 # the form: 453 # the form:
450 # <version-hash> <repo-url> 454 # <version-hash> <repo-url>
451 local snapshot_content="$(-antigen-echo-record | 455 local snapshot_content="$(-antigen-echo-record |
452 grep 'true$' | 456 grep 'true$' |
453 sed 's/ .*$//' | 457 sed 's/ .*$//' |
454 sort -u | 458 sort -u |
455 while read url; do 459 while read url; do
456 local dir="$(-antigen-get-clone-dir "$url")" 460 local dir="$(-antigen-get-clone-dir "$url")"
457 local version_hash="$(cd "$dir" && git rev-parse HEAD)" 461 local version_hash="$(cd "$dir" && git rev-parse HEAD)"
458 echo "$version_hash $url" 462 echo "$version_hash $url"
459 done)" 463 done)"
460 464
461 { 465 {
462 # The first line in the snapshot file is for metadata, in the form: 466 # The first line in the snapshot file is for metadata, in the form:
463 # key='value'; key='value'; key='value'; 467 # key='value'; key='value'; key='value';
464 # Where `key`s are valid shell variable names. 468 # Where `key`s are valid shell variable names.
465 469
466 # Snapshot version. Has no relation to antigen version. If the snapshot 470 # Snapshot version. Has no relation to antigen version. If the snapshot
467 # file format changes, this number can be incremented. 471 # file format changes, this number can be incremented.
468 echo -n "version='1';" 472 echo -n "version='1';"
469 473
470 # Snapshot creation date+time. 474 # Snapshot creation date+time.
471 echo -n " created_on='$(date)';" 475 echo -n " created_on='$(date)';"
472 476
473 # Add a checksum with the md5 checksum of all the snapshot lines. 477 # Add a checksum with the md5 checksum of all the snapshot lines.
474 local checksum="$(echo "$snapshot_content" | md5sum)" 478 local checksum="$(echo "$snapshot_content" | md5sum)"
475 echo -n " checksum='${checksum%% *}';" 479 echo -n " checksum='${checksum%% *}';"
476 480
477 # A newline after the metadata and then the snapshot lines. 481 # A newline after the metadata and then the snapshot lines.
478 echo "\n$snapshot_content" 482 echo "\n$snapshot_content"
479 483
480 } > "$snapshot_file" 484 } > "$snapshot_file"
481 485
482 } 486 }
483 487
484 antigen-restore () { 488 antigen-restore () {
485 489
486 if [[ $# == 0 ]]; then 490 if [[ $# == 0 ]]; then
487 echo 'Please provide a snapshot file to restore from.' >&2 491 echo 'Please provide a snapshot file to restore from.' >&2
488 return 1 492 return 1
489 fi 493 fi
490 494
491 local snapshot_file="$1" 495 local snapshot_file="$1"
492 496
493 # TODO: Before doing anything with the snapshot file, verify its checksum. 497 # TODO: Before doing anything with the snapshot file, verify its checksum.
494 # If it fails, notify this to the user and confirm if restore should 498 # If it fails, notify this to the user and confirm if restore should
495 # proceed. 499 # proceed.
496 500
497 echo -n "Restoring from $snapshot_file..." 501 echo -n "Restoring from $snapshot_file..."
498 502
499 sed -n '1!p' "$snapshot_file" | 503 sed -n '1!p' "$snapshot_file" |
500 while read line; do 504 while read line; do
501 505
502 local version_hash="${line%% *}" 506 local version_hash="${line%% *}"
503 local url="${line##* }" 507 local url="${line##* }"
504 local clone_dir="$(-antigen-get-clone-dir "$url")" 508 local clone_dir="$(-antigen-get-clone-dir "$url")"
505 509
506 if [[ ! -d $clone_dir ]]; then 510 if [[ ! -d $clone_dir ]]; then
507 git clone "$url" "$clone_dir" > /dev/null 511 git clone "$url" "$clone_dir" > /dev/null
508 fi 512 fi
509 513
510 (cd "$clone_dir" && git checkout $version_hash) 2> /dev/null 514 (cd "$clone_dir" && git checkout $version_hash) 2> /dev/null
511 515
512 done 516 done
513 517
514 echo ' done.' 518 echo ' done.'
515 echo 'Please open a new shell to get the restored changes.' 519 echo 'Please open a new shell to get the restored changes.'
516 } 520 }
517 521
518 antigen-help () { 522 antigen-help () {
519 cat <<EOF 523 cat <<EOF
520 Antigen is a plugin management system for zsh. It makes it easy to grab awesome 524 Antigen is a plugin management system for zsh. It makes it easy to grab awesome
521 shell scripts and utilities, put up on github. For further details and complete 525 shell scripts and utilities, put up on github. For further details and complete
522 documentation, visit the project's page at 'http://antigen.sharats.me'. 526 documentation, visit the project's page at 'http://antigen.sharats.me'.
523 EOF 527 EOF
524 } 528 }
525 529
526 # A syntax sugar to avoid the `-` when calling antigen commands. With this 530 # A syntax sugar to avoid the `-` when calling antigen commands. With this
527 # function, you can write `antigen-bundle` as `antigen bundle` and so on. 531 # function, you can write `antigen-bundle` as `antigen bundle` and so on.
528 antigen () { 532 antigen () {
529 local cmd="$1" 533 local cmd="$1"
530 shift 534 shift
531 "antigen-$cmd" "$@" 535 "antigen-$cmd" "$@"
532 } 536 }
533 537
534 -antigen-parse-args () { 538 -antigen-parse-args () {
535 # An argument parsing functionality to parse arguments the *antigen* way :). 539 # An argument parsing functionality to parse arguments the *antigen* way :).
536 # Takes one first argument (called spec), which dictates how to parse and 540 # Takes one first argument (called spec), which dictates how to parse and
537 # the rest of the arguments are parsed. Outputs a piece of valid shell code 541 # the rest of the arguments are parsed. Outputs a piece of valid shell code
538 # that can be passed to `eval` inside a function which creates the arguments 542 # that can be passed to `eval` inside a function which creates the arguments
539 # and their values as local variables. Suggested use is to set the defaults 543 # and their values as local variables. Suggested use is to set the defaults
540 # to all arguments first and then eval the output of this function. 544 # to all arguments first and then eval the output of this function.
541 545
542 # Spec: Only long argument supported. No support for parsing short options. 546 # Spec: Only long argument supported. No support for parsing short options.
543 # The spec must have two sections, separated by a `;`. 547 # The spec must have two sections, separated by a `;`.
544 # '<positional-arguments>;<keyword-only-arguments>' 548 # '<positional-arguments>;<keyword-only-arguments>'
545 # Positional arguments are passed as just values, like `command a b`. 549 # Positional arguments are passed as just values, like `command a b`.
546 # Keyword arguments are passed as a `--name=value` pair, like `command 550 # Keyword arguments are passed as a `--name=value` pair, like `command
547 # --arg1=a --arg2=b`. 551 # --arg1=a --arg2=b`.
548 552
549 # Each argument in the spec is separated by a `,`. Each keyword argument can 553 # Each argument in the spec is separated by a `,`. Each keyword argument can
550 # end in a `:` to specifiy that this argument wants a value, otherwise it 554 # end in a `:` to specifiy that this argument wants a value, otherwise it
551 # doesn't take a value. (The value in the output when the keyword argument 555 # doesn't take a value. (The value in the output when the keyword argument
552 # doesn't have a `:` is `true`). 556 # doesn't have a `:` is `true`).
553 557
554 # Arguments in either section can end with a `?` (should come after `:`, if 558 # Arguments in either section can end with a `?` (should come after `:`, if
555 # both are present), means optional. FIXME: Not yet implemented. 559 # both are present), means optional. FIXME: Not yet implemented.
556 560
557 # See the test file, tests/arg-parser.t for (working) examples. 561 # See the test file, tests/arg-parser.t for (working) examples.
558 562
559 local spec="$1" 563 local spec="$1"
560 shift 564 shift
561 565
562 # Sanitize the spec 566 # Sanitize the spec
563 spec="$(echo "$spec" | tr '\n' ' ' | sed 's/[[:space:]]//g')" 567 spec="$(echo "$spec" | tr '\n' ' ' | sed 's/[[:space:]]//g')"
564 568
565 local code='' 569 local code=''
566 570
567 --add-var () { 571 --add-var () {
568 test -z "$code" || code="$code\n" 572 test -z "$code" || code="$code\n"
569 code="${code}local $1='$2'" 573 code="${code}local $1='$2'"
570 } 574 }
571 575
572 local positional_args="$(echo "$spec" | cut -d\; -f1)" 576 local positional_args="$(echo "$spec" | cut -d\; -f1)"
573 local positional_args_count="$(echo $positional_args | 577 local positional_args_count="$(echo $positional_args |
574 awk -F, '{print NF}')" 578 awk -F, '{print NF}')"
575 579
576 # Set spec values based on the positional arguments. 580 # Set spec values based on the positional arguments.
577 local i=1 581 local i=1
578 while [[ -n $1 && $1 != --* ]]; do 582 while [[ -n $1 && $1 != --* ]]; do
579 583
580 if (( $i > $positional_args_count )); then 584 if (( $i > $positional_args_count )); then
581 echo "Only $positional_args_count positional arguments allowed." >&2 585 echo "Only $positional_args_count positional arguments allowed." >&2
582 echo "Found at least one more: '$1'" >&2 586 echo "Found at least one more: '$1'" >&2
583 return 587 return
584 fi 588 fi
585 589
586 local name_spec="$(echo "$positional_args" | cut -d, -f$i)" 590 local name_spec="$(echo "$positional_args" | cut -d, -f$i)"
587 local name="${${name_spec%\?}%:}" 591 local name="${${name_spec%\?}%:}"
588 local value="$1" 592 local value="$1"
589 593
590 if echo "$code" | grep -qm1 "^local $name="; then 594 if echo "$code" | grep -qm1 "^local $name="; then
591 echo "Argument '$name' repeated with the value '$value'". >&2 595 echo "Argument '$name' repeated with the value '$value'". >&2
592 return 596 return
593 fi 597 fi
594 598
595 --add-var $name "$value" 599 --add-var $name "$value"
596 600
597 shift 601 shift
598 i=$(($i + 1)) 602 i=$(($i + 1))
599 done 603 done
600 604
601 local keyword_args="$( 605 local keyword_args="$(
602 # Positional arguments can double up as keyword arguments too. 606 # Positional arguments can double up as keyword arguments too.
603 echo "$positional_args" | tr , '\n' | 607 echo "$positional_args" | tr , '\n' |
604 while read line; do 608 while read line; do
605 if [[ $line == *\? ]]; then 609 if [[ $line == *\? ]]; then
606 echo "${line%?}:?" 610 echo "${line%?}:?"
607 else 611 else
608 echo "$line:" 612 echo "$line:"
609 fi 613 fi
610 done 614 done
611 615
612 # Specified keyword arguments. 616 # Specified keyword arguments.
613 echo "$spec" | cut -d\; -f2 | tr , '\n' 617 echo "$spec" | cut -d\; -f2 | tr , '\n'
614 )" 618 )"
615 local keyword_args_count="$(echo $keyword_args | awk -F, '{print NF}')" 619 local keyword_args_count="$(echo $keyword_args | awk -F, '{print NF}')"
616 620
617 # Set spec values from keyword arguments, if any. The remaining arguments 621 # Set spec values from keyword arguments, if any. The remaining arguments
618 # are all assumed to be keyword arguments. 622 # are all assumed to be keyword arguments.
619 while [[ $1 == --* ]]; do 623 while [[ $1 == --* ]]; do
620 # Remove the `--` at the start. 624 # Remove the `--` at the start.
621 local arg="${1#--}" 625 local arg="${1#--}"
622 626
623 # Get the argument name and value. 627 # Get the argument name and value.
624 if [[ $arg != *=* ]]; then 628 if [[ $arg != *=* ]]; then
625 local name="$arg" 629 local name="$arg"
626 local value='' 630 local value=''
627 else 631 else
628 local name="${arg%\=*}" 632 local name="${arg%\=*}"
629 local value="${arg#*=}" 633 local value="${arg#*=}"
630 fi 634 fi
631 635
632 if echo "$code" | grep -qm1 "^local $name="; then 636 if echo "$code" | grep -qm1 "^local $name="; then
633 echo "Argument '$name' repeated with the value '$value'". >&2 637 echo "Argument '$name' repeated with the value '$value'". >&2
634 return 638 return
635 fi 639 fi
636 640
637 # The specification for this argument, used for validations. 641 # The specification for this argument, used for validations.
638 local arg_line="$(echo "$keyword_args" | grep -m1 "^$name:\??\?")" 642 local arg_line="$(echo "$keyword_args" | grep -m1 "^$name:\??\?")"
639 643
640 # Validate argument and value. 644 # Validate argument and value.
641 if [[ -z $arg_line ]]; then 645 if [[ -z $arg_line ]]; then
642 # This argument is not known to us. 646 # This argument is not known to us.
643 echo "Unknown argument '$name'." >&2 647 echo "Unknown argument '$name'." >&2
644 return 648 return
645 649
646 elif (echo "$arg_line" | grep -qm1 ':') && [[ -z $value ]]; then 650 elif (echo "$arg_line" | grep -qm1 ':') && [[ -z $value ]]; then
647 # This argument needs a value, but is not provided. 651 # This argument needs a value, but is not provided.
648 echo "Required argument for '$name' not provided." >&2 652 echo "Required argument for '$name' not provided." >&2
649 return 653 return
650 654
651 elif (echo "$arg_line" | grep -vqm1 ':') && [[ ! -z $value ]]; then 655 elif (echo "$arg_line" | grep -vqm1 ':') && [[ ! -z $value ]]; then
652 # This argument doesn't need a value, but is provided. 656 # This argument doesn't need a value, but is provided.
653 echo "No argument required for '$name', but provided '$value'." >&2 657 echo "No argument required for '$name', but provided '$value'." >&2
654 return 658 return
655 659
656 fi 660 fi
657 661
658 if [[ -z $value ]]; then 662 if [[ -z $value ]]; then
659 value=true 663 value=true
660 fi 664 fi
661 665
662 --add-var "${name//-/_}" "$value" 666 --add-var "${name//-/_}" "$value"
663 shift 667 shift
664 done 668 done
665 669
666 echo "$code" 670 echo "$code"
667 671
668 unfunction -- --add-var 672 unfunction -- --add-var
669 673
670 } 674 }
671 675
672 # Echo the bundle specs as in the record. The first line is not echoed since it 676 # Echo the bundle specs as in the record. The first line is not echoed since it
673 # is a blank line. 677 # is a blank line.
674 -antigen-echo-record () { 678 -antigen-echo-record () {
675 echo "$_ANTIGEN_BUNDLE_RECORD" | sed -n '1!p' 679 echo "$_ANTIGEN_BUNDLE_RECORD" | sed -n '1!p'
676 } 680 }
677 681
678 -antigen-env-setup () { 682 -antigen-env-setup () {
679 683
680 # Helper function: Same as `export $1=$2`, but will only happen if the name 684 # Helper function: Same as `export $1=$2`, but will only happen if the name
681 # specified by `$1` is not already set. 685 # specified by `$1` is not already set.
682 -set-default () { 686 -set-default () {
683 local arg_name="$1" 687 local arg_name="$1"
684 local arg_value="$2" 688 local arg_value="$2"
685 eval "test -z \"\$$arg_name\" && export $arg_name='$arg_value'" 689 eval "test -z \"\$$arg_name\" && export $arg_name='$arg_value'"
686 } 690 }
687 691
688 # Pre-startup initializations. 692 # Pre-startup initializations.
689 -set-default ANTIGEN_DEFAULT_REPO_URL \ 693 -set-default ANTIGEN_DEFAULT_REPO_URL \
690 https://github.com/robbyrussell/oh-my-zsh.git 694 https://github.com/robbyrussell/oh-my-zsh.git
691 -set-default ADOTDIR $HOME/.antigen 695 -set-default ADOTDIR $HOME/.antigen
692 696
693 # Setup antigen's own completion. 697 # Setup antigen's own completion.
694 compdef _antigen antigen 698 compdef _antigen antigen
695 699
696 # Remove private functions. 700 # Remove private functions.
697 unfunction -- -set-default 701 unfunction -- -set-default
698 } 702 }
699 703
700 # Setup antigen's autocompletion 704 # Setup antigen's autocompletion
701 _antigen () { 705 _antigen () {
702 compadd \ 706 compadd \
703 bundle \ 707 bundle \
704 bundles \ 708 bundles \
705 update \ 709 update \
706 revert \ 710 revert \
707 list \ 711 list \
708 cleanup \ 712 cleanup \
709 lib \ 713 lib \
710 selfupdate \ 714 selfupdate \
711 theme \ 715 theme \
712 apply \ 716 apply \
713 help 717 help
714 } 718 }
715 719
716 -antigen-env-setup 720 -antigen-env-setup
717 721