Date: Thu, 23 Apr 2020 18:06:47 +0000 (UTC) From: Emmanuel Vadot <manu@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r532700 - head/Mk/Scripts Message-ID: <202004231806.03NI6lq7056080@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004231806.03NI6lq7056080>