The following commit has been merged in the master branch:
commit 1f15ab7eae606dd42ab95812ca96489abc926e22
Merge: a229ea46e701af1c8d55ae44bb61b025af00ec1e
0b9351534cc4fa52cb31c1bf023e4e7514dc3b28
Author: Igor Murzov <[email protected]>
Date: Thu Dec 15 19:49:34 2011 +0400
Merge branch 'mount'
* mount:
testsuite: Add basic tests for umount.
umount: Real fix for completion of relative paths.
umount: Half-fix for completion of relative paths.
mount: Don't suggest short options.
mount, umount: Add linux-specific completions.
diff --combined completions/.gitignore
index 6ce1679,713d825..4e86f85
--- a/completions/.gitignore
+++ b/completions/.gitignore
@@@ -3,7 -3,6 +3,7 @@@ alpin
alternatives
animate
apropos
+arm-koji
asciidoc.py
autoheader
automake-1.11
@@@ -105,7 -104,6 +105,7 @@@ pm-suspen
pm-suspend-hybrid
pmake
postalias
+ppc-koji
puppetca
puppetd
puppetdoc
@@@ -135,7 -133,6 +135,7 @@@ rpm2targ
rpm2txz
rpmbuild
rpmbuild-md5
+s390-koji
sbcl-mt
scp
sdptool
@@@ -148,13 -145,11 +148,12 @@@ smbge
smbpasswd
smbtar
smbtree
+sparc-koji
spovray
stream
tightvncviewer
tracepath6
typeset
- umount
vgcfgbackup
vgcfgrestore
vgchange
diff --combined completions/Makefile.am
index 58a1875,d35fe00..797fc88
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@@ -28,7 -28,6 +28,7 @@@ bashcomp_DATA = a2x
cal \
cancel \
cardctl \
+ ccache \
cfagent \
cfrun \
chage \
@@@ -116,7 -115,6 +116,7 @@@
hping2 \
htpasswd \
iconv \
+ id \
idn \
iftop \
ifup \
@@@ -127,7 -125,6 +127,7 @@@
invoke-rc.d \
ionice \
ip \
+ iperf \
iptables \
ipmitool \
ipsec \
@@@ -149,7 -146,6 +149,7 @@@
killall \
kldload \
kldunload \
+ koji \
ktutil \
larch \
lastlog \
@@@ -171,7 -167,6 +171,7 @@@
lrzip \
lsof \
lvm \
+ lzip \
lzma \
lzop \
macof \
@@@ -192,6 -187,7 +192,7 @@@
mmsitepass \
monodevelop \
mount \
+ mount.linux \
mplayer \
msynctool \
mtx \
@@@ -203,7 -199,6 +204,7 @@@
mysql \
mysqladmin \
ncftp \
+ nethogs \
newgrp \
newlist \
newusers \
@@@ -295,6 -290,8 +296,8 @@@
tcpnice \
tracepath \
tune2fs \
+ umount \
+ umount.linux \
unace \
unpack200 \
unrar \
@@@ -306,7 -303,6 +309,7 @@@
useradd \
userdel \
usermod \
+ valgrind \
vipw \
vncviewer \
vpnc \
@@@ -343,7 -339,6 +346,7 @@@ CLEANFILES =
alternatives \
animate \
apropos \
+ arm-koji \
asciidoc.py \
autoheader \
automake-1.11 \
@@@ -445,7 -440,6 +448,7 @@@
pm-suspend-hybrid \
pmake \
postalias \
+ ppc-koji \
puppetca \
puppetd \
puppetdoc \
@@@ -475,7 -469,6 +478,7 @@@
rpm2txz \
rpmbuild \
rpmbuild-md5 \
+ s390-koji \
sbcl-mt \
scp \
sdptool \
@@@ -488,13 -481,11 +491,12 @@@
smbpasswd \
smbtar \
smbtree \
+ sparc-koji \
spovray \
stream \
tightvncviewer \
tracepath6 \
typeset \
- umount \
vgcfgbackup \
vgcfgrestore \
vgchange \
@@@ -641,10 -632,6 +643,10 @@@ symlinks
rm -f $(targetdir)/$$file && \
$(LN_S) killall $(targetdir)/$$file ; \
done
+ for file in arm-koji ppc-koji s390-koji sparc-koji ; do \
+ rm -f $(targetdir)/$$file && \
+ $(LN_S) koji $(targetdir)/$$file ; \
+ done
for file in ldapadd ldapmodify ldapdelete ldapcompare ldapmodrdn \
ldapwhoami ldappasswd ; do \
rm -f $(targetdir)/$$file && \
@@@ -675,10 -662,6 +677,6 @@@
rm -f $(targetdir)/$$file && \
$(LN_S) mcrypt $(targetdir)/$$file ; \
done
- for file in umount ; do \
- rm -f $(targetdir)/$$file && \
- $(LN_S) mount $(targetdir)/$$file ; \
- done
for file in mplayer2 mencoder gmplayer kplayer ; do \
rm -f $(targetdir)/$$file && \
$(LN_S) mplayer $(targetdir)/$$file ; \
--
bash-completion
_______________________________________________
Bash-completion-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/bash-completion-commits
