Date: Sun, 24 Sep 2006 11:12:25 +0200 From: Jeppe Larsen <jwl@io.dk> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/103550: [patch] fix for portinstall completion in shells/bash_completion Message-ID: <1159089145.1731@apnex.sysctl.dk> Resent-Message-ID: <200609240920.k8O9KNn2036679@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 103550
>Category: ports
>Synopsis: [patch] fix for portinstall completion in shells/bash_completion
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sun Sep 24 09:20:23 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Jeppe Larsen
>Release: FreeBSD 6.2-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD apnex.sysctl.dk 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #0: Tue Sep 19 16:59:02 CEST 2006 root@apnex.sysctl.dk:/usr/obj/usr/src/sys/MYKERNEL i386
>Description:
bash completion for portinstall seems to be broken. It complains about /usr/ports//INDEX not exists and for some reason the code only worked with INDEX-5. I have only checked the patch on my own system.
>How-To-Repeat:
portinstall <TAB>
>Fix:
--- bash_completion.diff begins here ---
--- bash_completion.old Sat Sep 23 20:42:29 2006
+++ bash_completion Sun Sep 24 10:55:26 2006
@@ -5485,14 +5485,10 @@
local cur portsdir prev indexfile
local -a COMPREPLY2
- portsdir=${PORTSDIR:-/usr/ports}/
+ portsdir=${PORTSDIR:-/usr/ports}
cur=${COMP_WORDS[COMP_CWORD]}
prev=${COMP_WORDS[COMP_CWORD-1]}
- # First try INDEX-5
- indexfile=$portsdir/INDEX-5
- # Then INDEX if INDEX-5 does not exist or system is not FreeBSD 5.x
- [ "${OSTYPE%.*}" = "freebsd5" -a -f $indexfile ] ||
- indexfile=$portsdir/INDEX
+ indexfile="${portsdir}/INDEX-${OSTYPE:7:1}"
[ "$prev" = "-l" -o "$prev" = "-L" -o "$prev" = "-o" ] && return 0
--- bash_completion.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1159089145.1731>