[Bash-completion-commits] ./current r1232: Improved rpm backup file avoidance.
Ville Skyttä
ville.skytta at iki.fi
Sun Jan 11 13:37:05 UTC 2009
------------------------------------------------------------
revno: 1232
committer: Ville Skyttä <ville.skytta at iki.fi>
branch nick: current
timestamp: Sun 2009-01-11 15:37:05 +0200
message:
Improved rpm backup file avoidance.
modified:
bash_completion
debian/changelog
-------------- next part --------------
=== modified file 'bash_completion'
--- a/bash_completion 2009-01-11 13:22:31 +0000
+++ b/bash_completion 2009-01-11 13:37:05 +0000
@@ -443,10 +443,10 @@
local sysvdir famdir
[ -d /etc/rc.d/init.d ] && sysvdir=/etc/rc.d/init.d || sysvdir=/etc/init.d
famdir=/etc/xinetd.d
- COMPREPLY=( $( builtin echo $sysvdir/!(*.rpmsave|*.rpmorig|*~|functions)) )
+ COMPREPLY=( $( builtin echo $sysvdir/!(*.rpm@(orig|new|save)|*~|functions)) )
if [ -d $famdir ]; then
- COMPREPLY=( "${COMPREPLY[@]}" $( builtin echo $famdir/!(*.rpmsave|*.rpmorig|*~)) )
+ COMPREPLY=( "${COMPREPLY[@]}" $( builtin echo $famdir/!(*.rpm@(orig|new|save)|*~)) )
fi
COMPREPLY=( $( compgen -W '${COMPREPLY[@]#@($sysvdir|$famdir)/}' -- $cur ) )
@@ -9017,7 +9017,7 @@
[ -d /etc/rc.d/init.d ] && sysvdir=/etc/rc.d/init.d \
|| sysvdir=/etc/init.d
- services=( $(echo $sysvdir/!(README*|*.sh|*.dpkg*|*.rpm*)) )
+ services=( $(echo $sysvdir/!(README*|*.sh|*.dpkg*|*.rpm@(orig|new|save))) )
services=( ${services[@]#$sysvdir/} )
options=( -f -n )
@@ -9083,7 +9083,7 @@
[ -d /etc/rc.d/init.d ] && sysvdir=/etc/rc.d/init.d \
|| sysvdir=/etc/init.d
- services=( $(echo $sysvdir/!(README*|*.sh|*.dpkg*|*.rpm*)) )
+ services=( $(echo $sysvdir/!(README*|*.sh|*.dpkg*|*.rpm@(orig|new|save))) )
services=( ${services[@]#$sysvdir/} )
options=( --help --quiet --force --try-anyway --disclose-deny --query --no-fallback )
@@ -9221,7 +9221,7 @@
if [ -d $BASH_COMPLETION_DIR -a -r $BASH_COMPLETION_DIR -a \
-x $BASH_COMPLETION_DIR ]; then
for i in $BASH_COMPLETION_DIR/*; do
- [[ ${i##*/} != @(*~|*.bak|*.swp|\#*\#|*.dpkg*|.rpm*) ]] &&
+ [[ ${i##*/} != @(*~|*.bak|*.swp|\#*\#|*.dpkg*|*.rpm@(orig|new|save)) ]] &&
[ \( -f $i -o -h $i \) -a -r $i ] && . $i
done
fi
=== modified file 'debian/changelog'
--- a/debian/changelog 2009-01-11 13:22:31 +0000
+++ b/debian/changelog 2009-01-11 13:37:05 +0000
@@ -53,7 +53,8 @@
* Added JPEG 2000 files to display completion, thanks to Bastien Nocera
(RHBZ: #304771)
* Improved rpm macro completion (Ville Skyttä).
- * Add -E to rpm completion (Ville Skyttä).
+ * Added -E to rpm completion (Ville Skyttä).
+ * Improved rpm backup file avoidance (Ville Skyttä).
* Merge from Gentoo:
- fix 'find' completion so that it properly completes on -?(i)whilename.
Patch by Ciaran McCreesh.
More information about the Bash-completion-commits
mailing list