diff options
| author |   Aaron Walker <ka0ttic@gentoo.org> | 2005-04-20 15:39:56 +0000 |
|---|---|---|
| committer | Aaron Walker <ka0ttic@gentoo.org> | 2005-04-20 15:39:56 +0000 |
| commit | a99e81fddcf2310ddd617ef623f2c5acfcaf68bd (patch) | |
| tree | 338cb1375fa9c0c6d278b9f1e44ef0087276aa07 | |
| parent | Added splat completion (diff) | |
| download | gentoo-bashcomp-a99e81fddcf2310ddd617ef623f2c5acfcaf68bd.tar.gz gentoo-bashcomp-a99e81fddcf2310ddd617ef623f2c5acfcaf68bd.tar.bz2 gentoo-bashcomp-a99e81fddcf2310ddd617ef623f2c5acfcaf68bd.zip | |
Fixed _portdir() to not spew errors if sed fails
svn path=/trunk/; revision=44
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | gentoo | 8 |
2 files changed, 8 insertions, 2 deletions
@@ -3,6 +3,8 @@ ChangeLog for gentoo-bashcomp 2005-04-19 Aaron Walker <ka0ttic@gentoo.org> * Added splat completion. + * Fixed _portdir() to not spew messages if for some reason + make.{conf,globals} is unreadable. 2005-04-18 Aaron Walker <ka0ttic@gentoo.org> @@ -21,11 +21,11 @@ have() _portdir() { sed -n -e '/^PORTDIR=/ { s/^[^=]\+="\?\([^"]\+\|\S\+\).*/\1/p ; q }' \ - /etc/make.{conf,globals} + /etc/make.{conf,globals} 2>/dev/null if [[ $1 == '-o' ]] ; then sed -n -e '/^PORTDIR_OVERLAY=/ { s/^[^=]\+="\?\([^"]\+\|\S\+\).*/\1/p ; q }' \ - /etc/make.conf + /etc/make.conf 2>/dev/null fi } @@ -1138,6 +1138,8 @@ _equery() ;; *) local glob loc + [[ -f ${portdir}/profiles/use.desc ]] || return 0 + [[ -f ${portdir}/profiles/use.local.desc ]] || return 0 glob=$(sed -n -e 's/^\([^ ]\+\) - .*$/\1/p' ${portdir}/profiles/use.desc) loc=$(sed -n -e 's/^[^ ]\+:\([^ ]*\) - .*$/\1/p' ${portdir}/profiles/use.local.desc) COMPREPLY=($(compgen -W "$glob $loc" -- $cur)) @@ -1163,6 +1165,8 @@ _ekeyword() cur="${COMP_WORDS[COMP_CWORD]}" portdir=$(_portdir) + [[ -f ${portdir}/profiles/arch.list ]] || return 0 + for arch in all $(< ${portdir}/profiles/arch.list) ; do archl_m="${archl_m} -${arch}" archl_u="${archl_u} ~${arch}" |