From owner-svn-ports-head@freebsd.org Thu Apr 23 18:06:48 2020 Return-Path: Delivered-To: svn-ports-head@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 03A432BF29B; Thu, 23 Apr 2020 18:06:48 +0000 (UTC) (envelope-from manu@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) server-signature RSA-PSS (4096 bits) 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 497QHC6HpZz48dF; Thu, 23 Apr 2020 18:06:47 +0000 (UTC) (envelope-from manu@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 D323F88F4; Thu, 23 Apr 2020 18:06:47 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03NI6lZm056081; Thu, 23 Apr 2020 18:06:47 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03NI6lq7056080; Thu, 23 Apr 2020 18:06:47 GMT (envelope-from manu@FreeBSD.org) Message-Id: <202004231806.03NI6lq7056080@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Thu, 23 Apr 2020 18:06:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r532700 - head/Mk/Scripts X-SVN-Group: ports-head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: head/Mk/Scripts X-SVN-Commit-Revision: 532700 X-SVN-Commit-Repository: ports 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.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Apr 2020 18:06:48 -0000 Author: manu Date: Thu Apr 23 18:06:47 2020 New Revision: 532700 URL: https://svnweb.freebsd.org/changeset/ports/532700 Log: users-groups-install: Make it pkg -r friendly The generated pre-install scripts isn't pkg -r friendly for all ports that have USERS/GROUPS with an homedir, fix that. Reviewed by: bapt Approved by: portmgr (bapt) Differential Revision: https://reviews.freebsd.org/D24531 Modified: head/Mk/Scripts/do-users-groups.sh Modified: head/Mk/Scripts/do-users-groups.sh ============================================================================== --- head/Mk/Scripts/do-users-groups.sh Thu Apr 23 17:42:08 2020 (r532699) +++ head/Mk/Scripts/do-users-groups.sh Thu Apr 23 18:06:47 2020 (r532700) @@ -138,8 +138,18 @@ if [ -n "${USERS}" ]; then /|/nonexistent|/var/empty) ;; *) + echo "echo \"===> Creating homedir(s)\"" >> "${dp_UG_INSTALL}" group=$(awk -F: -v gid=${gid} '$1 !~ /^#/ && $3 == gid { print $1 }' ${dp_GID_FILES}) - echo "${dp_INSTALL} -d -g $group -o $login $homedir" >> "${dp_UG_INSTALL}" + cat >> "${dp_UG_INSTALL}" <<-blah + if [ -n "\${PKG_ROOTDIR}" ] && [ "\${PKG_ROOTDIR}" != "/" ]; then + HOMEDIR="\${PKG_ROOTDIR}/$homedir" + MDBDIR="-N \${PKG_ROOTDIR}/etc/" + else + HOMEDIR="$homedir" + MDBDIR="" + fi + ${dp_INSTALL} \${MDBDIR} -d -g $group -o $login \${HOMEDIR} + blah ;; esac done <<-eot