mj / zsh-config

Download as
Browse Code ยป

Commit fae7cac7ef5accfcd112e14cc336180383f6f947

Authored by Xavier Garrido
1 parent 65520d3c6c

hide push/popd message. make git pull working with older git version

Showing 1 changed file with 9 additions and 2 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 --plugin-git pull
213 # If pull failed then try to pull directly from the clone directory
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
213 # Update submodules. 220 # Update submodules.
214 pushd 221 pushd > /dev/null
215 cd "$clone_dir" 222 cd "$clone_dir"
216 git submodule update --recursive 223 git submodule update --recursive
217 popd 224 popd > /dev/null
218 # Get the new revision. 225 # Get the new revision.
219 local new_rev="$(--plugin-git rev-parse HEAD)" 226 local new_rev="$(--plugin-git rev-parse HEAD)"
220 fi 227 fi
221 228
222 # If its a specific branch that we want, checkout that branch. 229 # If its a specific branch that we want, checkout that branch.
223 if [[ $url == *\|* ]]; then 230 if [[ $url == *\|* ]]; then
224 local current_branch=${$(--plugin-git symbolic-ref HEAD)##refs/heads/} 231 local current_branch=${$(--plugin-git symbolic-ref HEAD)##refs/heads/}
225 local requested_branch="${url#*|}" 232 local requested_branch="${url#*|}"
226 # Only do the checkout when we are not already on the branch. 233 # Only do the checkout when we are not already on the branch.
227 [[ $requested_branch != $current_branch ]] && 234 [[ $requested_branch != $current_branch ]] &&
228 --plugin-git checkout $requested_branch 235 --plugin-git checkout $requested_branch
229 fi 236 fi
230 237
231 if ! [[ -z $old_rev || $old_rev == $new_rev ]]; then 238 if ! [[ -z $old_rev || $old_rev == $new_rev ]]; then
232 echo Updated from ${old_rev:0:7} to ${new_rev:0:7}. 239 echo Updated from ${old_rev:0:7} to ${new_rev:0:7}.
233 if $verbose; then 240 if $verbose; then
234 --plugin-git log --oneline --reverse --no-merges --stat '@{1}..' 241 --plugin-git log --oneline --reverse --no-merges --stat '@{1}..'
235 fi 242 fi
236 fi 243 fi
237 244
238 # Remove the temporary git wrapper function. 245 # Remove the temporary git wrapper function.
239 unfunction -- --plugin-git 246 unfunction -- --plugin-git
240 247
241 } 248 }
242 249
243 -antigen-load () { 250 -antigen-load () {
244 251
245 local url="$1" 252 local url="$1"
246 local loc="$2" 253 local loc="$2"
247 local btype="$3" 254 local btype="$3"
248 local make_local_clone="$4" 255 local make_local_clone="$4"
249 256
250 # The full location where the plugin is located. 257 # The full location where the plugin is located.
251 local location 258 local location
252 if $make_local_clone; then 259 if $make_local_clone; then
253 location="$(-antigen-get-clone-dir "$url")/$loc" 260 location="$(-antigen-get-clone-dir "$url")/$loc"
254 else 261 else
255 location="$url" 262 location="$url"
256 fi 263 fi
257 264
258 if [[ $btype == theme ]]; then 265 if [[ $btype == theme ]]; then
259 266
260 # Of course, if its a theme, the location would point to the script 267 # Of course, if its a theme, the location would point to the script
261 # file. 268 # file.
262 source "$location" 269 source "$location"
263 270
264 else 271 else
265 272
266 # Source the plugin script. 273 # Source the plugin script.
267 # FIXME: I don't know. Looks very very ugly. Needs a better 274 # FIXME: I don't know. Looks very very ugly. Needs a better
268 # implementation once tests are ready. 275 # implementation once tests are ready.
269 local script_loc="$(ls "$location" | grep -m1 '\.plugin\.zsh$')" 276 local script_loc="$(ls "$location" | grep -m1 '\.plugin\.zsh$')"
270 277
271 if [[ -f $location/$script_loc ]]; then 278 if [[ -f $location/$script_loc ]]; then
272 # If we have a `*.plugin.zsh`, source it. 279 # If we have a `*.plugin.zsh`, source it.
273 source "$location/$script_loc" 280 source "$location/$script_loc"
274 281
275 elif [[ -f $location/init.zsh ]]; then 282 elif [[ -f $location/init.zsh ]]; then
276 # If we have a `init.zsh`, source it. 283 # If we have a `init.zsh`, source it.
277 source "$location/init.zsh" 284 source "$location/init.zsh"
278 285
279 elif ls "$location" | grep -qm1 '\.zsh$'; then 286 elif ls "$location" | grep -qm1 '\.zsh$'; then
280 # If there is no `*.plugin.zsh` file, source *all* the `*.zsh` 287 # If there is no `*.plugin.zsh` file, source *all* the `*.zsh`
281 # files. 288 # files.
282 for script ($location/*.zsh(N)) source "$script" 289 for script ($location/*.zsh(N)) source "$script"
283 290
284 elif ls "$location" | grep -qm1 '\.sh$'; then 291 elif ls "$location" | grep -qm1 '\.sh$'; then
285 # If there are no `*.zsh` files either, we look for and source any 292 # If there are no `*.zsh` files either, we look for and source any
286 # `*.sh` files instead. 293 # `*.sh` files instead.
287 for script ($location/*.sh(N)) source "$script" 294 for script ($location/*.sh(N)) source "$script"
288 295
289 fi 296 fi
290 297
291 # Add to $fpath, for completion(s). 298 # Add to $fpath, for completion(s).
292 fpath=($location $fpath) 299 fpath=($location $fpath)
293 300
294 fi 301 fi
295 302
296 } 303 }
297 304
298 antigen-cleanup () { 305 antigen-cleanup () {
299 306
300 # Cleanup unused repositories. 307 # Cleanup unused repositories.
301 308
302 local force=false 309 local force=false
303 if [[ $1 == --force ]]; then 310 if [[ $1 == --force ]]; then
304 force=true 311 force=true
305 fi 312 fi
306 313
307 if [[ ! -d "$ADOTDIR/repos" || -z "$(ls "$ADOTDIR/repos/")" ]]; then 314 if [[ ! -d "$ADOTDIR/repos" || -z "$(ls "$ADOTDIR/repos/")" ]]; then
308 echo "You don't have any bundles." 315 echo "You don't have any bundles."
309 return 0 316 return 0
310 fi 317 fi
311 318
312 # Find directores in ADOTDIR/repos, that are not in the bundles record. 319 # Find directores in ADOTDIR/repos, that are not in the bundles record.
313 local unused_clones="$(comm -13 \ 320 local unused_clones="$(comm -13 \
314 <(-antigen-echo-record | 321 <(-antigen-echo-record |
315 awk '$4 == "true" {print $1}' | 322 awk '$4 == "true" {print $1}' |
316 while read line; do 323 while read line; do
317 -antigen-get-clone-dir "$line" 324 -antigen-get-clone-dir "$line"
318 done | 325 done |
319 sort -u) \ 326 sort -u) \
320 <(ls -d "$ADOTDIR/repos/"* | sort -u))" 327 <(ls -d "$ADOTDIR/repos/"* | sort -u))"
321 328
322 if [[ -z $unused_clones ]]; then 329 if [[ -z $unused_clones ]]; then
323 echo "You don't have any unidentified bundles." 330 echo "You don't have any unidentified bundles."
324 return 0 331 return 0
325 fi 332 fi
326 333
327 echo 'You have clones for the following repos, but are not used.' 334 echo 'You have clones for the following repos, but are not used.'
328 echo "$unused_clones" | 335 echo "$unused_clones" |
329 while read line; do 336 while read line; do
330 -antigen-get-clone-url "$line" 337 -antigen-get-clone-url "$line"
331 done | 338 done |
332 sed -e 's/^/ /' -e 's/|/, branch /' 339 sed -e 's/^/ /' -e 's/|/, branch /'
333 340
334 if $force || (echo -n '\nDelete them all? [y/N] '; read -q); then 341 if $force || (echo -n '\nDelete them all? [y/N] '; read -q); then
335 echo 342 echo
336 echo 343 echo
337 echo "$unused_clones" | while read line; do 344 echo "$unused_clones" | while read line; do
338 echo -n "Deleting clone for $(-antigen-get-clone-url "$line")..." 345 echo -n "Deleting clone for $(-antigen-get-clone-url "$line")..."
339 rm -rf "$line" 346 rm -rf "$line"
340 echo ' done.' 347 echo ' done.'
341 done 348 done
342 else 349 else
343 echo 350 echo
344 echo Nothing deleted. 351 echo Nothing deleted.
345 fi 352 fi
346 } 353 }
347 354
348 antigen-lib () { 355 antigen-lib () {
349 antigen-bundle --loc=lib 356 antigen-bundle --loc=lib
350 } 357 }
351 358
352 antigen-prezto-lib () { 359 antigen-prezto-lib () {
353 antigen-bundle sorin-ionescu/prezto 360 antigen-bundle sorin-ionescu/prezto
354 export ZDOTDIR=$ADOTDIR/repos/ 361 export ZDOTDIR=$ADOTDIR/repos/
355 } 362 }
356 363
357 antigen-theme () { 364 antigen-theme () {
358 365
359 if [[ "$1" != */* && "$1" != --* ]]; then 366 if [[ "$1" != */* && "$1" != --* ]]; then
360 # The first argument is just a name of the plugin, to be picked up from 367 # The first argument is just a name of the plugin, to be picked up from
361 # the default repo. 368 # the default repo.
362 local name="${1:-robbyrussell}" 369 local name="${1:-robbyrussell}"
363 antigen-bundle --loc=themes/$name --btype=theme 370 antigen-bundle --loc=themes/$name --btype=theme
364 371
365 else 372 else
366 antigen-bundle "$@" --btype=theme 373 antigen-bundle "$@" --btype=theme
367 374
368 fi 375 fi
369 376
370 } 377 }
371 378
372 antigen-apply () { 379 antigen-apply () {
373 # Initialize completion. 380 # Initialize completion.
374 # TODO: Only load completions if there are any changes to the bundle 381 # TODO: Only load completions if there are any changes to the bundle
375 # repositories. 382 # repositories.
376 compinit -i 383 compinit -i
377 } 384 }
378 385
379 antigen-list () { 386 antigen-list () {
380 # List all currently installed bundles. 387 # List all currently installed bundles.
381 if [[ -z "$_ANTIGEN_BUNDLE_RECORD" ]]; then 388 if [[ -z "$_ANTIGEN_BUNDLE_RECORD" ]]; then
382 echo "You don't have any bundles." >&2 389 echo "You don't have any bundles." >&2
383 return 1 390 return 1
384 else 391 else
385 -antigen-echo-record | sort -u 392 -antigen-echo-record | sort -u
386 fi 393 fi
387 } 394 }
388 395
389 antigen-snapshot () { 396 antigen-snapshot () {
390 397
391 local snapshot_file="${1:-antigen-shapshot}" 398 local snapshot_file="${1:-antigen-shapshot}"
392 399
393 # The snapshot content lines are pairs of repo-url and git version hash, in 400 # The snapshot content lines are pairs of repo-url and git version hash, in
394 # the form: 401 # the form:
395 # <version-hash> <repo-url> 402 # <version-hash> <repo-url>
396 local snapshot_content="$(-antigen-echo-record | 403 local snapshot_content="$(-antigen-echo-record |
397 grep 'true$' | 404 grep 'true$' |
398 sed 's/ .*$//' | 405 sed 's/ .*$//' |
399 sort -u | 406 sort -u |
400 while read url; do 407 while read url; do
401 local dir="$(-antigen-get-clone-dir "$url")" 408 local dir="$(-antigen-get-clone-dir "$url")"
402 local version_hash="$(cd "$dir" && git rev-parse HEAD)" 409 local version_hash="$(cd "$dir" && git rev-parse HEAD)"
403 echo "$version_hash $url" 410 echo "$version_hash $url"
404 done)" 411 done)"
405 412
406 { 413 {
407 # The first line in the snapshot file is for metadata, in the form: 414 # The first line in the snapshot file is for metadata, in the form:
408 # key='value'; key='value'; key='value'; 415 # key='value'; key='value'; key='value';
409 # Where `key`s are valid shell variable names. 416 # Where `key`s are valid shell variable names.
410 417
411 # Snapshot version. Has no relation to antigen version. If the snapshot 418 # Snapshot version. Has no relation to antigen version. If the snapshot
412 # file format changes, this number can be incremented. 419 # file format changes, this number can be incremented.
413 echo -n "version='1';" 420 echo -n "version='1';"
414 421
415 # Snapshot creation date+time. 422 # Snapshot creation date+time.
416 echo -n " created_on='$(date)';" 423 echo -n " created_on='$(date)';"
417 424
418 # Add a checksum with the md5 checksum of all the snapshot lines. 425 # Add a checksum with the md5 checksum of all the snapshot lines.
419 local checksum="$(echo "$snapshot_content" | md5sum)" 426 local checksum="$(echo "$snapshot_content" | md5sum)"
420 echo -n " checksum='${checksum%% *}';" 427 echo -n " checksum='${checksum%% *}';"
421 428
422 # A newline after the metadata and then the snapshot lines. 429 # A newline after the metadata and then the snapshot lines.
423 echo "\n$snapshot_content" 430 echo "\n$snapshot_content"
424 431
425 } > "$snapshot_file" 432 } > "$snapshot_file"
426 433
427 } 434 }
428 435
429 antigen-restore () { 436 antigen-restore () {
430 437
431 if [[ $# == 0 ]]; then 438 if [[ $# == 0 ]]; then
432 echo 'Please provide a snapshot file to restore from.' >&2 439 echo 'Please provide a snapshot file to restore from.' >&2
433 return 1 440 return 1
434 fi 441 fi
435 442
436 local snapshot_file="$1" 443 local snapshot_file="$1"
437 444
438 # TODO: Before doing anything with the snapshot file, verify its checksum. 445 # TODO: Before doing anything with the snapshot file, verify its checksum.
439 # If it fails, notify this to the user and confirm if restore should 446 # If it fails, notify this to the user and confirm if restore should
440 # proceed. 447 # proceed.
441 448
442 echo -n "Restoring from $snapshot_file..." 449 echo -n "Restoring from $snapshot_file..."
443 450
444 sed -n '1!p' "$snapshot_file" | 451 sed -n '1!p' "$snapshot_file" |
445 while read line; do 452 while read line; do
446 453
447 local version_hash="${line%% *}" 454 local version_hash="${line%% *}"
448 local url="${line##* }" 455 local url="${line##* }"
449 local clone_dir="$(-antigen-get-clone-dir "$url")" 456 local clone_dir="$(-antigen-get-clone-dir "$url")"
450 457
451 if [[ ! -d $clone_dir ]]; then 458 if [[ ! -d $clone_dir ]]; then
452 git clone "$url" "$clone_dir" > /dev/null 459 git clone "$url" "$clone_dir" > /dev/null
453 fi 460 fi
454 461
455 (cd "$clone_dir" && git checkout $version_hash) 2> /dev/null 462 (cd "$clone_dir" && git checkout $version_hash) 2> /dev/null
456 463
457 done 464 done
458 465
459 echo ' done.' 466 echo ' done.'
460 echo 'Please open a new shell to get the restored changes.' 467 echo 'Please open a new shell to get the restored changes.'
461 } 468 }
462 469
463 antigen-help () { 470 antigen-help () {
464 cat <<EOF 471 cat <<EOF
465 Antigen is a plugin management system for zsh. It makes it easy to grab awesome 472 Antigen is a plugin management system for zsh. It makes it easy to grab awesome
466 shell scripts and utilities, put up on github. For further details and complete 473 shell scripts and utilities, put up on github. For further details and complete
467 documentation, visit the project's page at 'http://antigen.sharats.me'. 474 documentation, visit the project's page at 'http://antigen.sharats.me'.
468 EOF 475 EOF
469 } 476 }
470 477
471 # A syntax sugar to avoid the `-` when calling antigen commands. With this 478 # A syntax sugar to avoid the `-` when calling antigen commands. With this
472 # function, you can write `antigen-bundle` as `antigen bundle` and so on. 479 # function, you can write `antigen-bundle` as `antigen bundle` and so on.
473 antigen () { 480 antigen () {
474 local cmd="$1" 481 local cmd="$1"
475 shift 482 shift
476 "antigen-$cmd" "$@" 483 "antigen-$cmd" "$@"
477 } 484 }
478 485
479 -antigen-parse-args () { 486 -antigen-parse-args () {
480 # An argument parsing functionality to parse arguments the *antigen* way :). 487 # An argument parsing functionality to parse arguments the *antigen* way :).
481 # Takes one first argument (called spec), which dictates how to parse and 488 # Takes one first argument (called spec), which dictates how to parse and
482 # the rest of the arguments are parsed. Outputs a piece of valid shell code 489 # the rest of the arguments are parsed. Outputs a piece of valid shell code
483 # that can be passed to `eval` inside a function which creates the arguments 490 # that can be passed to `eval` inside a function which creates the arguments
484 # and their values as local variables. Suggested use is to set the defaults 491 # and their values as local variables. Suggested use is to set the defaults
485 # to all arguments first and then eval the output of this function. 492 # to all arguments first and then eval the output of this function.
486 493
487 # Spec: Only long argument supported. No support for parsing short options. 494 # Spec: Only long argument supported. No support for parsing short options.
488 # The spec must have two sections, separated by a `;`. 495 # The spec must have two sections, separated by a `;`.
489 # '<positional-arguments>;<keyword-only-arguments>' 496 # '<positional-arguments>;<keyword-only-arguments>'
490 # Positional arguments are passed as just values, like `command a b`. 497 # Positional arguments are passed as just values, like `command a b`.
491 # Keyword arguments are passed as a `--name=value` pair, like `command 498 # Keyword arguments are passed as a `--name=value` pair, like `command
492 # --arg1=a --arg2=b`. 499 # --arg1=a --arg2=b`.
493 500
494 # Each argument in the spec is separated by a `,`. Each keyword argument can 501 # Each argument in the spec is separated by a `,`. Each keyword argument can
495 # end in a `:` to specifiy that this argument wants a value, otherwise it 502 # end in a `:` to specifiy that this argument wants a value, otherwise it
496 # doesn't take a value. (The value in the output when the keyword argument 503 # doesn't take a value. (The value in the output when the keyword argument
497 # doesn't have a `:` is `true`). 504 # doesn't have a `:` is `true`).
498 505
499 # Arguments in either section can end with a `?` (should come after `:`, if 506 # Arguments in either section can end with a `?` (should come after `:`, if
500 # both are present), means optional. FIXME: Not yet implemented. 507 # both are present), means optional. FIXME: Not yet implemented.
501 508
502 # See the test file, tests/arg-parser.t for (working) examples. 509 # See the test file, tests/arg-parser.t for (working) examples.
503 510
504 local spec="$1" 511 local spec="$1"
505 shift 512 shift
506 513
507 # Sanitize the spec 514 # Sanitize the spec
508 spec="$(echo "$spec" | tr '\n' ' ' | sed 's/[[:space:]]//g')" 515 spec="$(echo "$spec" | tr '\n' ' ' | sed 's/[[:space:]]//g')"
509 516
510 local code='' 517 local code=''
511 518
512 --add-var () { 519 --add-var () {
513 test -z "$code" || code="$code\n" 520 test -z "$code" || code="$code\n"
514 code="${code}local $1='$2'" 521 code="${code}local $1='$2'"
515 } 522 }
516 523
517 local positional_args="$(echo "$spec" | cut -d\; -f1)" 524 local positional_args="$(echo "$spec" | cut -d\; -f1)"
518 local positional_args_count="$(echo $positional_args | 525 local positional_args_count="$(echo $positional_args |
519 awk -F, '{print NF}')" 526 awk -F, '{print NF}')"
520 527
521 # Set spec values based on the positional arguments. 528 # Set spec values based on the positional arguments.
522 local i=1 529 local i=1
523 while ! [[ -z $1 || $1 == --* ]]; do 530 while ! [[ -z $1 || $1 == --* ]]; do
524 531
525 if (( $i > $positional_args_count )); then 532 if (( $i > $positional_args_count )); then
526 echo "Only $positional_args_count positional arguments allowed." >&2 533 echo "Only $positional_args_count positional arguments allowed." >&2
527 echo "Found at least one more: '$1'" >&2 534 echo "Found at least one more: '$1'" >&2
528 return 535 return
529 fi 536 fi
530 537
531 local name_spec="$(echo "$positional_args" | cut -d, -f$i)" 538 local name_spec="$(echo "$positional_args" | cut -d, -f$i)"
532 local name="${${name_spec%\?}%:}" 539 local name="${${name_spec%\?}%:}"
533 local value="$1" 540 local value="$1"
534 541
535 if echo "$code" | grep -qm1 "^local $name="; then 542 if echo "$code" | grep -qm1 "^local $name="; then
536 echo "Argument '$name' repeated with the value '$value'". >&2 543 echo "Argument '$name' repeated with the value '$value'". >&2
537 return 544 return
538 fi 545 fi
539 546
540 --add-var $name "$value" 547 --add-var $name "$value"
541 548
542 shift 549 shift
543 i=$(($i + 1)) 550 i=$(($i + 1))
544 done 551 done
545 552
546 local keyword_args="$( 553 local keyword_args="$(
547 # Positional arguments can double up as keyword arguments too. 554 # Positional arguments can double up as keyword arguments too.
548 echo "$positional_args" | tr , '\n' | 555 echo "$positional_args" | tr , '\n' |
549 while read line; do 556 while read line; do
550 if [[ $line == *\? ]]; then 557 if [[ $line == *\? ]]; then
551 echo "${line%?}:?" 558 echo "${line%?}:?"
552 else 559 else
553 echo "$line:" 560 echo "$line:"
554 fi 561 fi
555 done 562 done
556 563
557 # Specified keyword arguments. 564 # Specified keyword arguments.
558 echo "$spec" | cut -d\; -f2 | tr , '\n' 565 echo "$spec" | cut -d\; -f2 | tr , '\n'
559 )" 566 )"
560 local keyword_args_count="$(echo $keyword_args | awk -F, '{print NF}')" 567 local keyword_args_count="$(echo $keyword_args | awk -F, '{print NF}')"
561 568
562 # Set spec values from keyword arguments, if any. The remaining arguments 569 # Set spec values from keyword arguments, if any. The remaining arguments
563 # are all assumed to be keyword arguments. 570 # are all assumed to be keyword arguments.
564 while [[ $1 == --* ]]; do 571 while [[ $1 == --* ]]; do
565 # Remove the `--` at the start. 572 # Remove the `--` at the start.
566 local arg="${1#--}" 573 local arg="${1#--}"
567 574
568 # Get the argument name and value. 575 # Get the argument name and value.
569 if [[ $arg != *=* ]]; then 576 if [[ $arg != *=* ]]; then
570 local name="$arg" 577 local name="$arg"
571 local value='' 578 local value=''
572 else 579 else
573 local name="${arg%\=*}" 580 local name="${arg%\=*}"
574 local value="${arg#*=}" 581 local value="${arg#*=}"
575 fi 582 fi
576 583
577 if echo "$code" | grep -qm1 "^local $name="; then 584 if echo "$code" | grep -qm1 "^local $name="; then
578 echo "Argument '$name' repeated with the value '$value'". >&2 585 echo "Argument '$name' repeated with the value '$value'". >&2
579 return 586 return
580 fi 587 fi
581 588
582 # The specification for this argument, used for validations. 589 # The specification for this argument, used for validations.
583 local arg_line="$(echo "$keyword_args" | grep -m1 "^$name:\??\?")" 590 local arg_line="$(echo "$keyword_args" | grep -m1 "^$name:\??\?")"
584 591
585 # Validate argument and value. 592 # Validate argument and value.
586 if [[ -z $arg_line ]]; then 593 if [[ -z $arg_line ]]; then
587 # This argument is not known to us. 594 # This argument is not known to us.
588 echo "Unknown argument '$name'." >&2 595 echo "Unknown argument '$name'." >&2
589 return 596 return
590 597
591 elif (echo "$arg_line" | grep -qm1 ':') && [[ -z $value ]]; then 598 elif (echo "$arg_line" | grep -qm1 ':') && [[ -z $value ]]; then
592 # This argument needs a value, but is not provided. 599 # This argument needs a value, but is not provided.
593 echo "Required argument for '$name' not provided." >&2 600 echo "Required argument for '$name' not provided." >&2
594 return 601 return
595 602
596 elif (echo "$arg_line" | grep -vqm1 ':') && [[ ! -z $value ]]; then 603 elif (echo "$arg_line" | grep -vqm1 ':') && [[ ! -z $value ]]; then
597 # This argument doesn't need a value, but is provided. 604 # This argument doesn't need a value, but is provided.
598 echo "No argument required for '$name', but provided '$value'." >&2 605 echo "No argument required for '$name', but provided '$value'." >&2
599 return 606 return
600 607
601 fi 608 fi
602 609
603 if [[ -z $value ]]; then 610 if [[ -z $value ]]; then
604 value=true 611 value=true
605 fi 612 fi
606 613
607 --add-var "${name//-/_}" "$value" 614 --add-var "${name//-/_}" "$value"
608 shift 615 shift
609 done 616 done
610 617
611 echo "$code" 618 echo "$code"
612 619
613 unfunction -- --add-var 620 unfunction -- --add-var
614 621
615 } 622 }
616 623
617 # Echo the bundle specs as in the record. The first line is not echoed since it 624 # Echo the bundle specs as in the record. The first line is not echoed since it
618 # is a blank line. 625 # is a blank line.
619 -antigen-echo-record () { 626 -antigen-echo-record () {
620 echo "$_ANTIGEN_BUNDLE_RECORD" | sed -n '1!p' 627 echo "$_ANTIGEN_BUNDLE_RECORD" | sed -n '1!p'
621 } 628 }
622 629
623 -antigen-env-setup () { 630 -antigen-env-setup () {
624 # Pre-startup initializations. 631 # Pre-startup initializations.
625 -set-default ANTIGEN_DEFAULT_REPO_URL \ 632 -set-default ANTIGEN_DEFAULT_REPO_URL \
626 https://github.com/robbyrussell/oh-my-zsh.git 633 https://github.com/robbyrussell/oh-my-zsh.git
627 -set-default ADOTDIR $HOME/.antigen 634 -set-default ADOTDIR $HOME/.antigen
628 635
629 # Load the compinit module. Required for `compdef` to be defined, which is 636 # Load the compinit module. Required for `compdef` to be defined, which is
630 # used by many plugins to define completions. 637 # used by many plugins to define completions.
631 autoload -U compinit 638 autoload -U compinit
632 compinit -i 639 compinit -i
633 640
634 # Setup antigen's own completion. 641 # Setup antigen's own completion.
635 compdef _antigen antigen 642 compdef _antigen antigen
636 } 643 }
637 644
638 # Same as `export $1=$2`, but will only happen if the name specified by `$1` is 645 # Same as `export $1=$2`, but will only happen if the name specified by `$1` is
639 # not already set. 646 # not already set.
640 -set-default () { 647 -set-default () {
641 local arg_name="$1" 648 local arg_name="$1"
642 local arg_value="$2" 649 local arg_value="$2"
643 eval "test -z \"\$$arg_name\" && export $arg_name='$arg_value'" 650 eval "test -z \"\$$arg_name\" && export $arg_name='$arg_value'"
644 } 651 }
645 652
646 # Setup antigen's autocompletion 653 # Setup antigen's autocompletion
647 _antigen () { 654 _antigen () {
648 compadd \ 655 compadd \
649 bundle\ 656 bundle\
650 bundles\ 657 bundles\
651 update\ 658 update\
652 revert\ 659 revert\
653 list\ 660 list\
654 cleanup\ 661 cleanup\
655 lib\ 662 lib\
656 theme\ 663 theme\
657 apply\ 664 apply\
658 help 665 help
659 } 666 }
660 667
661 -antigen-env-setup 668 -antigen-env-setup
662 669