diff options
author | Mike Frysinger <vapier@gentoo.org> | 2003-09-13 19:24:21 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2003-09-13 19:24:21 +0000 |
commit | 0b065cec132b4b70ebd8253f2398b5cb3bf3d731 (patch) | |
tree | efac05aa2ac3ebe8c1ed0d8c00cd706e548b0566 /eclass | |
parent | version bump (diff) | |
download | gentoo-2-0b065cec132b4b70ebd8253f2398b5cb3bf3d731.tar.gz gentoo-2-0b065cec132b4b70ebd8253f2398b5cb3bf3d731.tar.bz2 gentoo-2-0b065cec132b4b70ebd8253f2398b5cb3bf3d731.zip |
mktemp replacement #28587
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/eutils.eclass | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index 844cb4d23477..393a35f96b37 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.51 2003/09/08 02:10:46 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.52 2003/09/13 19:24:21 vapier Exp $ # # Author: Martin Schlemmer <azarah@gentoo.org> # @@ -456,6 +456,23 @@ get_number_of_jobs() { fi } +# Cheap replacement for when debianutils (and thus mktemp) +# do not exist on the users system +# vapier@gentoo.org +# +# Takes just 1 parameter (the directory to create tmpfile in) +mymktemp() { + local topdir=$1 + [ -z "${topdir}" ] && topdir=/tmp + if [ `which mktemp 2>/dev/null` ] ; then + mktemp -p ${topdir} + else + local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" + touch ${tmp} + echo ${tmp} + fi +} + # Simplify/standardize adding users to the system # vapier@gentoo.org # @@ -478,8 +495,7 @@ enewuser() { fi # setup a file for testing usernames/groups - local tmpfile="`mktemp -p ${T}`" - touch ${tmpfile} + local tmpfile="`mymktemp ${T}`" chown ${euser} ${tmpfile} >& /dev/null local realuser="`ls -l ${tmpfile} | awk '{print $3}'`" @@ -589,8 +605,7 @@ enewgroup() { fi # setup a file for testing groupname - local tmpfile="`mktemp -p ${T}`" - touch ${tmpfile} + local tmpfile="`mymktemp ${T}`" chgrp ${egroup} ${tmpfile} >& /dev/null local realgroup="`ls -l ${tmpfile} | awk '{print $4}'`" |