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