From jwl@io.dk  Sun Sep 24 09:12:37 2006
Return-Path: <jwl@io.dk>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id EDBA616A403
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 24 Sep 2006 09:12:37 +0000 (UTC)
	(envelope-from jwl@io.dk)
Received: from voroth.sysctl.dk (0x5551206f.adsl.cybercity.dk [85.81.32.111])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 79D3A43D6A
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 24 Sep 2006 09:12:36 +0000 (GMT)
	(envelope-from jwl@io.dk)
Received: from apnex.sysctl.dk (apnex.sysctl.dk [10.0.0.3])
	by voroth.sysctl.dk (Postfix) with ESMTP id C888F5A94B
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 24 Sep 2006 11:12:34 +0200 (CEST)
Message-Id: <1159089145.1731@apnex.sysctl.dk>
Date: Sun, 24 Sep 2006 11:12:25 +0200
From: Jeppe Larsen <jwl@io.dk>
Reply-To: Jeppe Larsen <jwl@io.dk>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] fix for portinstall completion in shells/bash_completion
X-Send-Pr-Version: 3.113
X-GNATS-Notify: kirk@strauser.com

>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:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 24 09:20:23 GMT 2006
>Closed-Date:    Sat Oct 07 03:33:20 GMT 2006
>Last-Modified:  Sat Oct  7 03:40:18 GMT 2006
>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:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sun Sep 24 10:55:23 UTC 2006 
State-Changed-Why:  
Awaiting maintainers feedback 

http://www.freebsd.org/cgi/query-pr.cgi?pr=103550 

From: Kirk Strauser <kirk@strauser.com>
To: bug-followup@freebsd.org,
 jwl@io.dk
Cc:  
Subject: Re: ports/103550: [patch] fix for portinstall completion in shells/bash_completion
Date: Sun, 24 Sep 2006 11:10:55 -0500

 --nextPart1347262.mcUrfsYNcZ
 Content-Type: text/plain;
   charset="us-ascii"
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: inline
 
 Looks OK to me.
 =2D-=20
 Kirk Strauser
 
 --nextPart1347262.mcUrfsYNcZ
 Content-Type: application/pgp-signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (FreeBSD)
 
 iD8DBQBFFq4U5sRg+Y0CpvERAiGiAJ44WNJSrZFk/cnWwue8iCpt6+MrywCgh4Fk
 17tCWSli7kxz5TZ/bGirqlQ=
 =xe2q
 -----END PGP SIGNATURE-----
 
 --nextPart1347262.mcUrfsYNcZ--
State-Changed-From-To: feedback->closed 
State-Changed-By: shaun 
State-Changed-When: Sat Oct 7 03:31:48 UTC 2006 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=103550 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/103550: commit references a PR
Date: Sat,  7 Oct 2006 03:32:35 +0000 (UTC)

 shaun       2006-10-07 03:32:29 UTC
 
   FreeBSD ports repository
 
   Modified files:
     shells/bash-completion Makefile 
   Added files:
     shells/bash-completion/files patch-bash_completion 
   Log:
   Fix auto-completion for portinstall and /usr/ports/INDEX-*.
   
   PR:             ports/103550
   Submitted by:   Jeppe Larsen <jwl@io.dk>
   Approved by:    Kirk Strauser <kirk@strauser.com> (maintainer)
   
   Revision  Changes    Path
   1.15      +1 -0      ports/shells/bash-completion/Makefile
   1.1       +19 -0     ports/shells/bash-completion/files/patch-bash_completion (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
