Merge branch 'master' of https://github.com/Bash-it/bash-it

plugins/available/alias-completion.plugin.bash

@@ -1,3 +1,6 @@
+# Load after the other completions to understand what needs to be completed
+# BASH_IT_LOAD_PRIORITY: 365
+
 cite about-plugin
 about-plugin 'Automatic completion of aliases'
 

plugins/available/base.plugin.bash

@@ -144,7 +144,7 @@ function usage ()
     fi
 }
 
-if [ ! -e $BASH_IT/plugins/enabled/todo.plugin.bash ]; then
+if [ ! -e "${BASH_IT}/plugins/enabled/todo.plugin.bash" ] && [ ! -e "${BASH_IT}/plugins/enabled/*${BASH_IT_LOAD_PRIORITY_SEPARATOR}todo.plugin.bash" ]; then
 # if user has installed todo plugin, skip this...
     function t ()
     {
@@ -205,10 +205,10 @@ function buf ()
     cp -a "${filename}" "${filename}_${filetime}"
 }
 
-function del() { 
+function del() {
     about 'move files to hidden folder in tmp, that gets cleared on each reboot'
     param 'file or folder to be deleted'
     example 'del ./file.txt'
     group 'base'
-    mkdir -p /tmp/.trash && mv "$@" /tmp/.trash; 
+    mkdir -p /tmp/.trash && mv "$@" /tmp/.trash;
 }

plugins/available/fzf.plugin.bash

@@ -1,3 +1,6 @@
+# Load after the system completion to make sure that the fzf completions are working
+# BASH_IT_LOAD_PRIORITY: 375
+
 cite about-plugin
 about-plugin 'load fzf, if you are using it'
 

plugins/available/nvm.plugin.bash

@@ -1,11 +1,13 @@
 # Bash-it no longer bundles nvm, as this was quickly becoming outdated.
 #
+# BASH_IT_LOAD_PRIORITY: 225
+#
 # Please install nvm from https://github.com/creationix/nvm.git if you want to use it.
 
 cite about-plugin
 about-plugin 'node version manager configuration'
 
-export NVM_DIR="$HOME/.nvm"
+export NVM_DIR=${NVM_DIR:-$HOME/.nvm}
 # This loads nvm
 if command -v brew &>/dev/null && [ -s $(brew --prefix nvm)/nvm.sh ]
 then

plugins/available/z.plugin.bash

@@ -15,7 +15,7 @@ about-plugin '                              z is DEPRECATED, use fasd instead'
 #   * z -t foo  # goes to most recently accessed dir matching foo
 #   * z -l foo  # list all dirs matching foo (by frecency)
 
-if [ -e $BASH_IT/plugins/enabled/fasd.plugin.bash ]; then
+if [ -e "${BASH_IT}/plugins/enabled/fasd.plugin.bash" ] || [ -e "${BASH_IT}/plugins/enabled/*${BASH_IT_LOAD_PRIORITY_SEPARATOR}fasd.plugin.bash" ]; then
     printf '%s\n' 'sorry, the z plugin is incompatible with the fasd plugin. you may use either, but not both.'
     return
 fi