From: Mike Frysinger Date: Thu, 3 Nov 2011 00:26:17 +0000 (+0000) Subject: restore egethome as some packages in the tree have been parsing getent directly for... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5bed262287f4ddd7f63068dcccd3e8c8c99b7ca6;p=gentoo.git restore egethome as some packages in the tree have been parsing getent directly for this --- diff --git a/eclass/portability.eclass b/eclass/portability.eclass index cdfb7a2c2002..36ff9a8bea7f 100644 --- a/eclass/portability.eclass +++ b/eclass/portability.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/portability.eclass,v 1.19 2011/10/31 17:39:52 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/portability.eclass,v 1.20 2011/11/03 00:26:17 vapier Exp $ # # Author: Diego Pettenò # @@ -129,6 +129,5 @@ get_mounts() { } _dead_portability_user_funcs() { die "if you really need this, please file a bug for base-system@gentoo.org"; } -egethome() { _dead_portability_user_funcs; } egetshell() { _dead_portability_user_funcs; } is-login-disabled() { _dead_portability_user_funcs; } diff --git a/eclass/user.eclass b/eclass/user.eclass index 4631ca10e2ba..1ae623d38dbf 100644 --- a/eclass/user.eclass +++ b/eclass/user.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/user.eclass,v 1.5 2011/11/03 00:24:19 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/user.eclass,v 1.6 2011/11/03 00:26:17 vapier Exp $ # @ECLASS: user.eclass # @MAINTAINER: @@ -404,3 +404,22 @@ enewgroup() { esac export SANDBOX_ON="${oldsandbox}" } + +# @FUNCTION: egethome +# @USAGE: +# @DESCRIPTION: +# Gets the home directory for the specified user. +egethome() { + local pos + + case ${CHOST} in + *-darwin*|*-freebsd*|*-dragonfly*) + pos=9 + ;; + *) # Linux, NetBSD, OpenBSD, etc... + pos=6 + ;; + esac + + egetent passwd $1 | cut -d: -f${pos} +}