summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVille Skyttä <ville.skytta@iki.fi>2010-12-20 23:44:59 +0200
committerVille Skyttä <ville.skytta@iki.fi>2010-12-20 23:46:47 +0200
commit2d4ebbaf25d324ad03e9f231ab7fe9ec55b259a7 (patch)
treea2da05971a4d311409201cfc53861150ae311121
parentcd8dcff223a27cc0950cc377e450c32b2590edd3 (diff)
downloadbash-completion-2d4ebbaf25d324ad03e9f231ab7fe9ec55b259a7.tar.gz
Ignore muttrc source entries that are not files (Alioth: #312881).
-rw-r--r--CHANGES1
-rw-r--r--completions/mutt2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 49a44a52..e89aeef3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -41,6 +41,7 @@ bash-completion (2.x)
* Add/improve various autotools completions.
* Add *.apk to unzip and jar filename completions.
* Do not load bash_completion in profile.d script if progcomp is not enabled.
+ * Ignore muttrc source entries that are not files (Alioth: #312881).
[ Freddy Vulto ]
* Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
diff --git a/completions/mutt b/completions/mutt
index b8124f28..a753a652 100644
--- a/completions/mutt
+++ b/completions/mutt
@@ -58,7 +58,7 @@ _muttconffiles()
while [[ "$1" ]]; do
newconffiles=( $(sed -n 's|^source[[:space:]]\{1,\}\([^[:space:]]\{1,\}\).*$|\1|p' $(eval echo $1) ) )
for file in "${newconffiles[@]}"; do
- [[ ! "$file" || "${sofar/ ${file} / }" != "$sofar" ]] &&
+ [[ ! -f "$file" || "${sofar/ ${file} / }" != "$sofar" ]] &&
continue
sofar="$sofar $file"
sofar=" $(eval _muttconffiles \"$sofar\" $file) "