diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2003-07-18 15:10:13 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2003-07-18 15:10:13 +0000 |
| commit | 318a8570fd24419d761e352ec2701fec65e56c01 (patch) | |
| tree | de1ae616a2335464428fd19d775a3a263cbbf42d /eclass/games.eclass | |
| parent | Editied init scripts from "use net" to "need net" (diff) | |
| download | gentoo-2-318a8570fd24419d761e352ec2701fec65e56c01.tar.gz gentoo-2-318a8570fd24419d761e352ec2701fec65e56c01.tar.bz2 gentoo-2-318a8570fd24419d761e352ec2701fec65e56c01.zip | |
Added file matching to games_get_cd and made enewuser and enewgroup less chatty
Diffstat (limited to 'eclass/games.eclass')
| -rw-r--r-- | eclass/games.eclass | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/eclass/games.eclass b/eclass/games.eclass index 163cf6d09a36..5468289d08f8 100644 --- a/eclass/games.eclass +++ b/eclass/games.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/games.eclass,v 1.40 2003/07/10 02:03:39 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.41 2003/07/18 15:10:13 wolf31o2 Exp $ # # devlist: {bass,phoenix,vapier}@gentoo.org # @@ -119,13 +119,14 @@ games_pkg_postinst() { } # some games require cdrom's to install datafiles ... -# $1: directory to check for on cdrom +# $1: directory or file to check for on cdrom # after function call, cdrom should be in ${GAMES_CD} games_get_cd() { export GAMES_CD=${GAMES_CDROM} if [ -z "${GAMES_CD}" ] ; then for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do - [ -d ${mline}/${1} ] && GAMES_CD=${mline} + [ -d ${mline}/${1} ] && GAMES_CD=${mline} || + [ -f ${mline}/${1} ] && GAMES_CD=${mline} done fi [ ! -z "${GAMES_CD}" ] && einfo "Using ${GAMES_CD} as the data source" |