mj / zsh-config

Download as
Browse Code ยป

Commit 3ddbb44cc1970df3c28c59ae3ee684da9ef6b396

Authored by Xavier Garrido
1 parent fae7cac7ef

use subshell and not push/popd

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