Change zsh match order

Author: mattmc3

README.md

@@ -175,7 +175,7 @@ function plugin-load {
         https://github.com/$repo $plugdir
     fi
     if [[ ! -e $initfile ]]; then
-      initfiles=($plugdir/*.{plugin.zsh,zsh,sh,zsh-theme}(N))
+      initfiles=($plugdir/*.{plugin.zsh,zsh-theme,zsh,sh}(N))
       (( $#initfiles )) || { echo >&2 "No init file '$repo'." && continue }
       ln -sf $initfiles[1] $initfile
     fi
@@ -335,7 +335,7 @@ function plugin-clone {
         https://github.com/$repo $plugdir
     fi
     if [[ ! -e $initfile ]]; then
-      initfiles=($plugdir/*.{plugin.zsh,zsh,sh,zsh-theme}(N))
+      initfiles=($plugdir/*.{plugin.zsh,zsh-theme,zsh,sh}(N))
       (( $#initfiles )) && ln -sf $initfiles[1] $initfile
     fi
   done

examples/ohmyzsh_zshrc.zsh

@@ -10,7 +10,7 @@ function plugin-load {
       git clone -q --depth 1 --recursive --shallow-submodules https://github.com/$repo $plugdir
     fi
     if [[ ! -e $initfile ]]; then
-      initfiles=($plugdir/*.{plugin.zsh,zsh,sh,zsh-theme}(N))
+      initfiles=($plugdir/*.{plugin.zsh,zsh-theme,zsh,sh}(N))
       (( $#initfiles )) || { echo >&2 "No init file found '$repo'." && continue }
       ln -sf $initfiles[1] $initfile
     fi

examples/prezto_zshrc.zsh

@@ -15,7 +15,7 @@ function contrib-clone() {
         https://github.com/$repo $plugin_dir
     fi
     if [[ ! -e $initfile ]]; then
-      initfiles=($plugin_dir/*.{plugin.zsh,zsh,sh,zsh-theme}(N))
+      initfiles=($plugin_dir/*.{plugin.zsh,zsh-theme,zsh,sh}(N))
       (( $#initfiles )) && ln -sf $initfiles[1] $initfile
     fi
   done

examples/zshrc.zsh

@@ -14,7 +14,7 @@ function plugin-load {
         https://github.com/$repo $plugdir
     fi
     if [[ ! -e $initfile ]]; then
-      initfiles=($plugdir/*.{plugin.zsh,zsh,sh,zsh-theme}(N))
+      initfiles=($plugdir/*.{plugin.zsh,zsh-theme,zsh,sh}(N))
       (( $#initfiles )) || { echo >&2 "No init file found '$repo'." && continue }
       ln -sf $initfiles[1] $initfile
     fi

examples/zshrc_clone.zsh

@@ -15,7 +15,7 @@ function plugin-clone {
       git clone -q --depth 1 --recursive --shallow-submodules https://github.com/$repo $plugdir
     fi
     if [[ ! -e $initfile ]]; then
-      initfiles=($plugdir/*.{plugin.zsh,zsh,sh,zsh-theme}(N))
+      initfiles=($plugdir/*.{plugin.zsh,zsh-theme,zsh,sh}(N))
       (( $#initfiles )) && ln -sf $initfiles[1] $initfile
     fi
   done

unplugged.zsh

@@ -26,7 +26,7 @@ function plugin-load {
         https://github.com/$repo $plugdir
     fi
     if [[ ! -e $initfile ]]; then
-      initfiles=($plugdir/*.{plugin.zsh,zsh,sh,zsh-theme}(N))
+      initfiles=($plugdir/*.{plugin.zsh,zsh-theme,zsh,sh}(N))
       (( $#initfiles )) || { echo >&2 "No init file found '$repo'." && continue }
       ln -sf $initfiles[1] $initfile
     fi

zsh_unplugged.zsh

@@ -52,10 +52,10 @@ function plugin-script {
   for plugin in $@; do
     [[ $plugin == /* ]] || plugin=${plugin#*/}
     initpaths=(
-      $ZUNPLUG_CUSTOM/${plugin}/*.{plugin.zsh,zsh,zsh-theme,sh}(N)
-      $ZUNPLUG_REPOS/${plugin}/*.{plugin.zsh,zsh,zsh-theme,sh}(N)
+      {$ZUNPLUG_CUSTOM,$ZUNPLUG_REPOS}/${plugin}/${plugin:t}.{plugin.zsh,zsh-theme,zsh,sh}(N)
+      {$ZUNPLUG_CUSTOM,$ZUNPLUG_REPOS}/${plugin}/*.{plugin.zsh,zsh-theme,zsh,sh}(N)
       $ZUNPLUG_REPOS/$plugin(N)
-      ${plugin}/*.{plugin.zsh,zsh,zsh-theme,sh}(N)
+      ${plugin}/*.{plugin.zsh,zsh-theme,zsh,sh}(N)
       ${plugin}(N)
     )
     (( $#initpaths )) || { echo >&2 "Plugin file not found '$plugin'." && continue }