psi-jack
/
tpm
mirror of
1
0
Fork 0
Code Issues Releases Wiki Activity

Improve `sourced_files` method. 

There are several issues with this method, such as #141, #112 probably
some others, which says there are problem installing plugins.
The problme is that `sourced_files` method doesn't always correctly
identifies sources files, so plugin settings defined in those
configuration files would not be loaded.

This change fixes this by doing next things:

  * excluding `tmux source` command, which could present in config
  * greping all `source` lines
  * awk command is left original
  * using `eval`, so that globed files `source *.conf` would be loaded
    as well
This commit is contained in:
Grigory Chernyshev 2018-09-30 17:25:09 +02:00
parent 95f78336c3
commit 7f25487004
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/helpers/plugin_functions.sh
View File

@ -27,8 +27,12 @@ _tmux_conf_contents() {
# return files sourced from tmux config files
_sourced_files() {
_tmux_conf_contents |
awk '/^[ \t]*source(-file)? +/ { gsub(/'\''/,""); gsub(/'\"'/,""); print $2 }'
for f in $(_tmux_conf_contents |
grep "tmux source .*" -v |
grep "source .*" -o |
awk '/^[ \t]*source(-file)? +/ { gsub(/'\''/,""); gsub(/'\"'/,""); print $2 }'); do
eval ls $f; # eval is required as there could be `source *.conf` to exapnd globs
done
}
# Want to be able to abort in certain cases