From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Sep 24 09:20:25 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1FD8716A407 for ; Sun, 24 Sep 2006 09:20:25 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0EFAA43D76 for ; Sun, 24 Sep 2006 09:20:24 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k8O9KNs0036686 for ; Sun, 24 Sep 2006 09:20:23 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k8O9KNn2036679; Sun, 24 Sep 2006 09:20:23 GMT (envelope-from gnats) Resent-Date: Sun, 24 Sep 2006 09:20:23 GMT Resent-Message-Id: <200609240920.k8O9KNn2036679@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jeppe Larsen Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EDBA616A403 for ; 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 ; 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 ; 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 To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/103550: [patch] fix for portinstall completion in shells/bash_completion X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Jeppe Larsen List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Sep 2006 09:20:25 -0000 >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 >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: