From owner-svn-ports-all@freebsd.org  Thu Oct 22 06:39:17 2020
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 21866440122;
 Thu, 22 Oct 2020 06:39:17 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4CGyPx02Glz4RZ6;
 Thu, 22 Oct 2020 06:39:17 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D94E1125C4;
 Thu, 22 Oct 2020 06:39:16 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09M6dGA3033785;
 Thu, 22 Oct 2020 06:39:16 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09M6dGYp033784;
 Thu, 22 Oct 2020 06:39:16 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <202010220639.09M6dGYp033784@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 22 Oct 2020 06:39:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r552938 - head/Keywords
X-SVN-Group: ports-head
X-SVN-Commit-Author: bapt
X-SVN-Commit-Paths: head/Keywords
X-SVN-Commit-Revision: 552938
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Oct 2020 06:39:17 -0000

Author: bapt
Date: Thu Oct 22 06:39:16 2020
New Revision: 552938
URL: https://svnweb.freebsd.org/changeset/ports/552938

Log:
  Convert @shell from shell script to lua script
  
  This makes @shell rootdir friendly and cross install friendly
  as well as capsicumized.
  
  Bonus: the /etc/shells is now only touched when needed
  
  Reviewed by:	manu, mat
  Approved by:	portmgr (mat)
  Differential Revision:	D26640

Modified:
  head/Keywords/shell.ucl

Modified: head/Keywords/shell.ucl
==============================================================================
--- head/Keywords/shell.ucl	Thu Oct 22 06:38:09 2020	(r552937)
+++ head/Keywords/shell.ucl	Thu Oct 22 06:39:16 2020	(r552938)
@@ -8,21 +8,40 @@
 #
 
 actions: [file]
-post-install: <<EOD
-  case "%@" in
-  /*) file="%@" ;;
-  *) file="%D/%@" ;;
-  esac
-        cp ${PKG_ROOTDIR}/etc/shells ${PKG_ROOTDIR}/etc/shells.bak
-        (grep -v "^${file}$" ${PKG_ROOTDIR}/etc/shells.bak; echo ${file}) > ${PKG_ROOTDIR}/etc/shells
-        rm -f ${PKG_ROOTDIR}/etc/shells.bak
+post-install-lua: <<EOD
+  shell_path = pkg.prefixed_path("%@")
+  shell = io.open("/etc/shells", "r+")
+  while true do
+    line = shell:read()
+    if line == nil then break end
+    if line == shell_path then
+      -- the shell path is already in the shell file
+      shell:close()
+      return
+    end
+  end
+  shell:write(shell_path .. "\n")
+  shell:close()
 EOD
-pre-deinstall: <<EOD
-  case "%@" in
-  /*) file="%@" ;;
-  *) file="%D/%@" ;;
-  esac
-        cp ${PKG_ROOTDIR}/etc/shells ${PKG_ROOTDIR}/etc/shells.bak
-        grep -v "^${file}$" ${PKG_ROOTDIR}/etc/shells.bak > ${PKG_ROOTDIR}/etc/shells
-        rm -f ${PKG_ROOTDIR}/etc/shells.bak
+pre-deinstall-lua: <<EOD
+  shell_path = pkg.prefixed_path("%@")
+  shellsbuf = ""
+  shells_path = "/etc/shells"
+  shell = io.open(shells_path, "r+")
+  found = false
+  while true do
+    line = shell:read()
+    if line == nil then break end
+    if line == shell_path then
+      found = true
+    else
+      shellsbuf = shellsbuf .. line .. "\n"
+    end
+  end
+  shell:close()
+  if found then
+    shell = io.open(shells_path, "w+")
+    shell:write(shellsbuf)
+    shell:close()
+  end
 EOD