From owner-svn-ports-head@FreeBSD.ORG  Mon Feb 16 21:34:47 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3EFA5522;
 Mon, 16 Feb 2015 21:34:47 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 299403B6;
 Mon, 16 Feb 2015 21:34:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1GLYl57060683;
 Mon, 16 Feb 2015 21:34:47 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1GLYl0t060682;
 Mon, 16 Feb 2015 21:34:47 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201502162134.t1GLYl0t060682@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Mon, 16 Feb 2015 21:34:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r379119 - head/Keywords
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Feb 2015 21:34:47 -0000

Author: markj (src committer)
Date: Mon Feb 16 21:34:46 2015
New Revision: 379119
URL: https://svnweb.freebsd.org/changeset/ports/379119
QAT: https://qat.redports.org/buildarchive/r379119/

Log:
  When updating /etc/shells, only remove existing entries that match the new
  entry exactly. Otherwise we may clobber entries that contain the new entry
  as a substring.
  
  Reviewed by:	bdrewery
  Approved by:	bdrewery
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/Keywords/shell.ucl

Modified: head/Keywords/shell.ucl
==============================================================================
--- head/Keywords/shell.ucl	Mon Feb 16 21:28:10 2015	(r379118)
+++ head/Keywords/shell.ucl	Mon Feb 16 21:34:46 2015	(r379119)
@@ -18,7 +18,7 @@ post-install: <<EOD
   *) file="%D/%@" ;;
   esac
         cp /etc/shells /etc/shells.bak
-        (grep -v ${file} /etc/shells.bak; echo ${file}) > /etc/shells
+        (grep -v "^${file}$" /etc/shells.bak; echo ${file}) > /etc/shells
         rm -f /etc/shells.bak
 EOD
 pre-deinstall: <<EOD
@@ -27,6 +27,6 @@ pre-deinstall: <<EOD
   *) file="%D/%@" ;;
   esac
         cp /etc/shells /etc/shells.bak
-        grep -v ${file} /etc/shells.bak > /etc/shells
+        grep -v "^${file}$" /etc/shells.bak > /etc/shells
         rm -f /etc/shells.bak
 EOD