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