XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed checks for enabled files in existing plugins

pull/974/head
Nils Winkler 2017-05-29 07:33:52 +02:00
parent 951fe918c0
commit 6f26f92c97
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/available/base.plugin.bash
View File

@ -136,7 +136,7 @@ function usage ()
fi 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... # if user has installed todo plugin, skip this...
function t () function t ()
{ {
@ -197,10 +197,10 @@ function buf ()
cp -a "${filename}" "${filename}_${filetime}" cp -a "${filename}" "${filename}_${filetime}"
} }
function del() { function del() {
about 'move files to hidden folder in tmp, that gets cleared on each reboot' about 'move files to hidden folder in tmp, that gets cleared on each reboot'
param 'file or folder to be deleted' param 'file or folder to be deleted'
example 'del ./file.txt' example 'del ./file.txt'
group 'base' group 'base'
mkdir -p /tmp/.trash && mv "$@" /tmp/.trash; mkdir -p /tmp/.trash && mv "$@" /tmp/.trash;
} }

2
plugins/available/z.plugin.bash
View File

@ -15,7 +15,7 @@ about-plugin ' z is DEPRECATED, use fasd instead'
# * z -t foo # goes to most recently accessed dir matching foo # * z -t foo # goes to most recently accessed dir matching foo
# * z -l foo # list all dirs matching foo (by frecency) # * 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.' printf '%s\n' 'sorry, the z plugin is incompatible with the fasd plugin. you may use either, but not both.'
return return
fi fi