/[gentoo-x86]/eclass/eutils.eclass
Gentoo

Diff of /eclass/eutils.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.186 Revision 1.279
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2006 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.186 2005/07/06 20:20:03 agriffis Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.279 2007/04/25 09:14:35 carlo Exp $
4#
5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 4#
7# This eclass is for general purpose functions that most ebuilds 5# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 6# have to implement themselves.
9# 7#
10# NB: If you add anything, please comment it! 8# NB: If you add anything, please comment it!
9#
10# Maintainer: see each individual function, base-system@gentoo.org as default
11 11
12inherit multilib 12inherit multilib portability
13INHERITED="$INHERITED $ECLASS"
14
15DEPEND="!bootstrap? ( sys-devel/patch )"
16# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 13
18DESCRIPTION="Based on the ${ECLASS} eclass" 14DESCRIPTION="Based on the ${ECLASS} eclass"
19 15
20# Wait for the supplied number of seconds. If no argument is supplied, defaults 16# Wait for the supplied number of seconds. If no argument is supplied, defaults
21# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 17# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
22# outputting to a terminal, don't wait. For compatability purposes, the argument 18# outputting to a terminal, don't wait. For compatability purposes, the argument
23# must be an integer greater than zero. 19# must be an integer greater than zero.
24# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
25epause() { 21epause() {
26 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then 22 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
27 sleep ${1:-5}
28 fi
29} 23}
30 24
31# Beep the specified number of times (defaults to five). If our output 25# Beep the specified number of times (defaults to five). If our output
32# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set, 26# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set,
33# don't beep. 27# don't beep.
34# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 28# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
35ebeep() { 29ebeep() {
36 local n 30 local n
37 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then 31 if [[ -z ${EBEEP_IGNORE} ]] ; then
38 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 32 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
39 echo -ne "\a" 33 echo -ne "\a"
40 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null 34 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
41 echo -ne "\a" 35 echo -ne "\a"
42 sleep 1 36 sleep 1
43 done 37 done
44 fi 38 fi
45} 39}
46 40
47# This function generate linker scripts in /usr/lib for dynamic 41# This function generate linker scripts in /usr/lib for dynamic
48# libs in /lib. This is to fix linking problems when you have 42# libs in /lib. This is to fix linking problems when you have
49# the .so in /lib, and the .a in /usr/lib. What happens is that 43# the .so in /lib, and the .a in /usr/lib. What happens is that
50# in some cases when linking dynamic, the .a in /usr/lib is used 44# in some cases when linking dynamic, the .a in /usr/lib is used
51# instead of the .so in /lib due to gcc/libtool tweaking ld's 45# instead of the .so in /lib due to gcc/libtool tweaking ld's
52# library search path. This cause many builds to fail. 46# library search path. This cause many builds to fail.
53# See bug #4411 for more info. 47# See bug #4411 for more info.
54# 48#
55# To use, simply call: 49# To use, simply call:
56# 50#
57# gen_usr_ldscript libfoo.so 51# gen_usr_ldscript libfoo.so
58# 52#
59# Note that you should in general use the unversioned name of 53# Note that you should in general use the unversioned name of
60# the library, as ldconfig should usually update it correctly 54# the library, as ldconfig should usually update it correctly
61# to point to the latest version of the library present. 55# to point to the latest version of the library present.
62# 56#
63# <azarah@gentoo.org> (26 Oct 2002) 57# <azarah@gentoo.org> (26 Oct 2002)
64# 58#
65gen_usr_ldscript() { 59gen_usr_ldscript() {
60 if [[ $(type -t _tc_gen_usr_ldscript) == "function" ]] ; then
61 _tc_gen_usr_ldscript "$@"
62 return $?
63 fi
64
65 ewarn "QA Notice: Please upgrade your ebuild to use toolchain-funcs"
66 ewarn "QA Notice: rather than gen_usr_ldscript() from eutils"
67
66 local libdir="$(get_libdir)" 68 local lib libdir=$(get_libdir)
67 # Just make sure it exists 69 # Just make sure it exists
68 dodir /usr/${libdir} 70 dodir /usr/${libdir}
69 71
70 for lib in "${@}" ; do 72 for lib in "${@}" ; do
71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 73 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
72 /* GNU ld script 74 /* GNU ld script
73 Since Gentoo has critical dynamic libraries 75 Since Gentoo has critical dynamic libraries
74 in /lib, and the static versions in /usr/lib, 76 in /lib, and the static versions in /usr/lib,
75 we need to have a "fake" dynamic lib in /usr/lib, 77 we need to have a "fake" dynamic lib in /usr/lib,
76 otherwise we run into linking problems. 78 otherwise we run into linking problems.
77 79
78 See bug http://bugs.gentoo.org/4411 for more info. 80 See bug http://bugs.gentoo.org/4411 for more info.
79 */ 81 */
80 GROUP ( /${libdir}/${lib} ) 82 GROUP ( /${libdir}/${lib} )
81 END_LDSCRIPT 83 END_LDSCRIPT
82 fperms a+x "/usr/${libdir}/${lib}" 84 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
83 done 85 done
84} 86}
85 87
86# Simple function to draw a line consisting of '=' the same length as $*
87# - only to be used by epatch()
88#
89# <azarah@gentoo.org> (11 Nov 2002)
90#
91draw_line() {
92 local i=0
93 local str_length=""
94
95 # Handle calls that do not have args, or wc not being installed ...
96 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
97 then
98 echo "==============================================================="
99 return 0
100 fi
101
102 # Get the length of $*
103 str_length="$(echo -n "$*" | wc -m)"
104
105 while [ "$i" -lt "${str_length}" ]
106 do
107 echo -n "="
108
109 i=$((i + 1))
110 done
111
112 echo
113
114 return 0
115}
116 88
117# Default directory where patches are located 89# Default directory where patches are located
118EPATCH_SOURCE="${WORKDIR}/patch" 90EPATCH_SOURCE="${WORKDIR}/patch"
119# Default extension for patches 91# Default extension for patches
120EPATCH_SUFFIX="patch.bz2" 92EPATCH_SUFFIX="patch.bz2"
121# Default options for patch 93# Default options for patch
122# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 94# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
123# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 95# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
96# Set -E to automatically remove empty files.
124EPATCH_OPTS="-g0 --no-backup-if-mismatch" 97EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
125# List of patches not to apply. Not this is only file names, 98# List of patches not to apply. Not this is only file names,
126# and not the full path .. 99# and not the full path ..
127EPATCH_EXCLUDE="" 100EPATCH_EXCLUDE=""
128# Change the printed message for a single patch. 101# Change the printed message for a single patch.
129EPATCH_SINGLE_MSG="" 102EPATCH_SINGLE_MSG=""
130# Change the printed message for multiple patches. 103# Change the printed message for multiple patches.
131EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 104EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
132# Force applying bulk patches even if not following the style: 105# Force applying bulk patches even if not following the style:
133# 106#
134# ??_${ARCH}_foo.${EPATCH_SUFFIX} 107# ??_${ARCH}_foo.${EPATCH_SUFFIX}
135# 108#
136EPATCH_FORCE="no" 109EPATCH_FORCE="no"
137 110
138# This function is for bulk patching, or in theory for just one 111# This function is for bulk patching, or in theory for just one
139# or two patches. 112# or two patches.
150# 123#
151# Patches are applied in current directory. 124# Patches are applied in current directory.
152# 125#
153# Bulk Patches should preferibly have the form of: 126# Bulk Patches should preferibly have the form of:
154# 127#
155# ??_${ARCH}_foo.${EPATCH_SUFFIX} 128# ??_${ARCH}_foo.${EPATCH_SUFFIX}
156# 129#
157# For example: 130# For example:
158# 131#
159# 01_all_misc-fix.patch.bz2 132# 01_all_misc-fix.patch.bz2
160# 02_sparc_another-fix.patch.bz2 133# 02_sparc_another-fix.patch.bz2
161# 134#
162# This ensures that there are a set order, and you can have ARCH 135# This ensures that there are a set order, and you can have ARCH
163# specific patches. 136# specific patches.
164# 137#
165# If you however give an argument to epatch(), it will treat it as a 138# If you however give an argument to epatch(), it will treat it as a
167# hand its a directory, it will set EPATCH_SOURCE to this. 140# hand its a directory, it will set EPATCH_SOURCE to this.
168# 141#
169# <azarah@gentoo.org> (10 Nov 2002) 142# <azarah@gentoo.org> (10 Nov 2002)
170# 143#
171epatch() { 144epatch() {
145 _epatch_draw_line() {
146 [[ -z $1 ]] && set "$(printf "%65s" '')"
147 echo "${1//?/=}"
148 }
149 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
172 local PIPE_CMD="" 150 local PIPE_CMD=""
173 local STDERR_TARGET="${T}/$$.out" 151 local STDERR_TARGET="${T}/$$.out"
174 local PATCH_TARGET="${T}/$$.patch" 152 local PATCH_TARGET="${T}/$$.patch"
175 local PATCH_SUFFIX="" 153 local PATCH_SUFFIX=""
176 local SINGLE_PATCH="no" 154 local SINGLE_PATCH="no"
177 local x="" 155 local x=""
156
157 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
178 158
179 if [ "$#" -gt 1 ] 159 if [ "$#" -gt 1 ]
180 then 160 then
181 local m="" 161 local m=""
182 for m in "$@" ; do 162 for m in "$@" ; do
246 fi 226 fi
247 for x in ${EPATCH_SOURCE} 227 for x in ${EPATCH_SOURCE}
248 do 228 do
249 # New ARCH dependant patch naming scheme ... 229 # New ARCH dependant patch naming scheme ...
250 # 230 #
251 # ???_arch_foo.patch 231 # ???_arch_foo.patch
252 # 232 #
253 if [ -f ${x} ] && \ 233 if [ -f ${x} ] && \
254 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \ 234 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
255 [ "${EPATCH_FORCE}" = "yes" ]) 235 [ "${EPATCH_FORCE}" = "yes" ])
256 then 236 then
257 local count=0 237 local count=0
258 local popts="${EPATCH_OPTS}" 238 local popts="${EPATCH_OPTS}"
259 local patchname=${x##*/} 239 local patchname=${x##*/}
260 240
283 263
284 # Allow for prefix to differ ... im lazy, so shoot me :/ 264 # Allow for prefix to differ ... im lazy, so shoot me :/
285 while [ "${count}" -lt 5 ] 265 while [ "${count}" -lt 5 ]
286 do 266 do
287 # Generate some useful debug info ... 267 # Generate some useful debug info ...
288 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 268 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
289 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290 270
291 if [ "${PATCH_SUFFIX}" != "patch" ] 271 if [ "${PATCH_SUFFIX}" != "patch" ]
292 then 272 then
293 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 273 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
294 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 274 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
295 else 275 else
296 PATCH_TARGET="${x}" 276 PATCH_TARGET="${x}"
297 fi 277 fi
298 278
299 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
300 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 280 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 281
302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
303 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
304 284
305 if [ "${PATCH_SUFFIX}" != "patch" ] 285 if [ "${PATCH_SUFFIX}" != "patch" ]
306 then 286 then
307 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 287 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
308 then 288 then
312 count=5 292 count=5
313 break 293 break
314 fi 294 fi
315 fi 295 fi
316 296
317 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 297 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
318 then 298 then
319 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 299 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 301 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 303 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 304
325 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 305 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
306 _epatch_assert
326 307
327 if [ "$?" -ne 0 ] 308 if [ "$?" -ne 0 ]
328 then 309 then
329 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 310 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
330 echo 311 echo
376# vapier@gentoo.org 357# vapier@gentoo.org
377# 358#
378# Takes just 1 optional parameter (the directory to create tmpfile in) 359# Takes just 1 optional parameter (the directory to create tmpfile in)
379emktemp() { 360emktemp() {
380 local exe="touch" 361 local exe="touch"
381 [ "$1" == "-d" ] && exe="mkdir" && shift 362 [[ $1 == -d ]] && exe="mkdir" && shift
382 local topdir="$1" 363 local topdir=$1
383 364
384 if [ -z "${topdir}" ] 365 if [[ -z ${topdir} ]] ; then
385 then
386 [ -z "${T}" ] \ 366 [[ -z ${T} ]] \
387 && topdir="/tmp" \ 367 && topdir="/tmp" \
388 || topdir="${T}" 368 || topdir=${T}
389 fi 369 fi
390 370
391 if [ -z "$(type -p mktemp)" ] 371 if [[ -z $(type -p mktemp) ]] ; then
392 then
393 local tmp=/ 372 local tmp=/
394 while [ -e "${tmp}" ] ; do 373 while [[ -e ${tmp} ]] ; do
395 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 374 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
396 done 375 done
397 ${exe} "${tmp}" 376 ${exe} "${tmp}" || ${exe} -p "${tmp}"
398 echo "${tmp}" 377 echo "${tmp}"
399 else 378 else
400 [ "${exe}" == "touch" ] \ 379 if [[ ${exe} == "touch" ]] ; then
401 && exe="-p" \ 380 [[ ${USERLAND} == "GNU" ]] \
402 || exe="-d" 381 && mktemp -p "${topdir}" \
403 mktemp ${exe} "${topdir}" 382 || TMPDIR="${topdir}" mktemp -t tmp
383 else
384 [[ ${USERLAND} == "GNU" ]] \
385 && mktemp -d "${topdir}" \
386 || TMPDIR="${topdir}" mktemp -dt tmp
387 fi
404 fi 388 fi
405} 389}
406 390
407# Small wrapper for getent (Linux), nidump (Mac OS X), 391# Small wrapper for getent (Linux), nidump (Mac OS X),
408# and pw (FreeBSD) used in enewuser()/enewgroup() 392# and pw (FreeBSD) used in enewuser()/enewgroup()
409# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 393# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
410# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 394# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
411# 395#
412# egetent(database, key) 396# egetent(database, key)
413egetent() { 397egetent() {
414 if [[ "${USERLAND}" == "Darwin" ]] ; then 398 case ${CHOST} in
399 *-darwin*)
415 case "$2" in 400 case "$2" in
416 *[!0-9]*) # Non numeric 401 *[!0-9]*) # Non numeric
417 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 402 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
418 ;; 403 ;;
419 *) # Numeric 404 *) # Numeric
420 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 405 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
421 ;; 406 ;;
422 esac 407 esac
423 elif [[ "${USERLAND}" == "BSD" ]] ; then 408 ;;
424 local action 409 *-freebsd*|*-dragonfly*)
425 if [ "$1" == "passwd" ] 410 local opts action="user"
426 then 411 [[ $1 == "passwd" ]] || action="group"
427 action="user" 412
428 else 413 # lookup by uid/gid
429 action="group" 414 if [[ $2 == [[:digit:]]* ]] ; then
415 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
430 fi 416 fi
417
431 pw show "${action}" "$2" -q 418 pw show ${action} ${opts} "$2" -q
432 else 419 ;;
420 *-netbsd*|*-openbsd*)
421 grep "$2:\*:" /etc/$1
422 ;;
423 *)
433 which nscd >& /dev/null && nscd -i "$1" 424 type -p nscd >& /dev/null && nscd -i "$1"
434 getent "$1" "$2" 425 getent "$1" "$2"
435 fi 426 ;;
427 esac
436} 428}
437 429
438# Simplify/standardize adding users to the system 430# Simplify/standardize adding users to the system
439# vapier@gentoo.org 431# vapier@gentoo.org
440# 432#
447# shell: /bin/false 439# shell: /bin/false
448# homedir: /dev/null 440# homedir: /dev/null
449# groups: none 441# groups: none
450# extra: comment of 'added by portage for ${PN}' 442# extra: comment of 'added by portage for ${PN}'
451enewuser() { 443enewuser() {
444 case ${EBUILD_PHASE} in
445 unpack|compile|test|install)
446 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
447 eerror "Package fails at QA and at life. Please file a bug."
448 die "Bad package! enewuser is only for use in pkg_* functions!"
449 esac
450
452 # get the username 451 # get the username
453 local euser=$1; shift 452 local euser=$1; shift
454 if [[ -z ${euser} ]] ; then 453 if [[ -z ${euser} ]] ; then
455 eerror "No username specified !" 454 eerror "No username specified !"
456 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
457 fi 456 fi
458 457
459 # lets see if the username already exists 458 # lets see if the username already exists
460 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then 459 if [[ -n $(egetent passwd "${euser}") ]] ; then
461 return 0 460 return 0
462 fi 461 fi
463 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
464 463
465 # options to pass to useradd 464 # options to pass to useradd
466 local opts= 465 local opts=
467 466
468 # handle uid 467 # handle uid
469 local euid=$1; shift 468 local euid=$1; shift
470 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then 469 if [[ -n ${euid} && ${euid} != -1 ]] ; then
471 if [[ ${euid} -gt 0 ]] ; then 470 if [[ ${euid} -gt 0 ]] ; then
472 if [[ ! -z $(egetent passwd ${euid}) ]] ; then 471 if [[ -n $(egetent passwd ${euid}) ]] ; then
473 euid="next" 472 euid="next"
474 fi 473 fi
475 else 474 else
476 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
477 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
478 fi 477 fi
479 else 478 else
480 euid="next" 479 euid="next"
481 fi 480 fi
482 if [[ ${euid} == "next" ]] ; then 481 if [[ ${euid} == "next" ]] ; then
483 local pwrange 482 for ((euid = 101; euid <= 999; euid++)); do
484 if [[ ${USERLAND} == "BSD" ]] ; then
485 pwrange=$(jot 898 101)
486 else
487 pwrange=$(seq 101 999)
488 fi
489 for euid in ${pwrange} ; do
490 [[ -z $(egetent passwd ${euid}) ]] && break 483 [[ -z $(egetent passwd ${euid}) ]] && break
491 done 484 done
492 fi 485 fi
493 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
494 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
495 488
496 # handle shell 489 # handle shell
497 local eshell=$1; shift 490 local eshell=$1; shift
498 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
499 if [[ ! -e ${eshell} ]] ; then 492 if [[ ! -e ${ROOT}${eshell} ]] ; then
500 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
501 die "${eshell} does not exist" 494 die "${eshell} does not exist in ${ROOT}"
495 fi
496 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
497 eerror "Do not specify ${eshell} yourself, use -1"
498 die "Pass '-1' as the shell parameter"
502 fi 499 fi
503 else 500 else
501 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
502 [[ -x ${ROOT}${shell} ]] && break
503 done
504
505 if [[ ${shell} == "/dev/null" ]] ; then
506 eerror "Unable to identify the shell to use, proceeding with userland default."
504 case ${USERLAND} in 507 case ${USERLAND} in
505 Darwin) eshell="/usr/bin/false";; 508 GNU) shell="/bin/false" ;;
506 BSD) eshell="/usr/sbin/nologin";; 509 BSD) shell="/sbin/nologin" ;;
507 *) eshell="/bin/false";; 510 Darwin) shell="/usr/sbin/nologin" ;;
511 *) die "Unable to identify the default shell for userland ${USERLAND}"
508 esac 512 esac
513 fi
514
515 eshell=${shell}
509 fi 516 fi
510 einfo " - Shell: ${eshell}" 517 einfo " - Shell: ${eshell}"
511 opts="${opts} -s ${eshell}" 518 opts="${opts} -s ${eshell}"
512 519
513 # handle homedir 520 # handle homedir
550 einfo " - Groups: ${egroups}" 557 einfo " - Groups: ${egroups}"
551 558
552 # handle extra and add the user 559 # handle extra and add the user
553 local oldsandbox=${SANDBOX_ON} 560 local oldsandbox=${SANDBOX_ON}
554 export SANDBOX_ON="0" 561 export SANDBOX_ON="0"
555 case ${USERLAND} in 562 case ${CHOST} in
556 Darwin) 563 *-darwin*)
557 ### Make the user 564 ### Make the user
558 if [[ -z $@ ]] ; then 565 if [[ -z $@ ]] ; then
559 dscl . create /users/${euser} uid ${euid} 566 dscl . create /users/${euser} uid ${euid}
560 dscl . create /users/${euser} shell ${eshell} 567 dscl . create /users/${euser} shell ${eshell}
561 dscl . create /users/${euser} home ${ehome} 568 dscl . create /users/${euser} home ${ehome}
572 einfo "Please report the ebuild along with the info below" 579 einfo "Please report the ebuild along with the info below"
573 einfo "eextra: $@" 580 einfo "eextra: $@"
574 die "Required function missing" 581 die "Required function missing"
575 fi 582 fi
576 ;; 583 ;;
577 BSD) 584 *-freebsd*|*-dragonfly*)
578 if [[ -z $@ ]] ; then 585 if [[ -z $@ ]] ; then
579 pw useradd ${euser} ${opts} \ 586 pw useradd ${euser} ${opts} \
580 -c "added by portage for ${PN}" \ 587 -c "added by portage for ${PN}" \
581 die "enewuser failed" 588 die "enewuser failed"
582 else 589 else
583 einfo " - Extra: $@" 590 einfo " - Extra: $@"
584 pw useradd ${euser} ${opts} \ 591 pw useradd ${euser} ${opts} \
585 "$@" || die "enewuser failed" 592 "$@" || die "enewuser failed"
586 fi 593 fi
587 ;; 594 ;;
595
596 *-netbsd*)
597 if [[ -z $@ ]] ; then
598 useradd ${opts} ${euser} || die "enewuser failed"
599 else
600 einfo " - Extra: $@"
601 useradd ${opts} ${euser} "$@" || die "enewuser failed"
602 fi
603 ;;
604
605 *-openbsd*)
606 if [[ -z $@ ]] ; then
607 useradd -u ${euid} -s ${eshell} \
608 -d ${ehome} -c "Added by portage for ${PN}" \
609 -g ${egroups} ${euser} || die "enewuser failed"
610 else
611 einfo " - Extra: $@"
612 useradd -u ${euid} -s ${eshell} \
613 -d ${ehome} -c "Added by portage for ${PN}" \
614 -g ${egroups} ${euser} "$@" || die "enewuser failed"
615 fi
616 ;;
617
588 *) 618 *)
589 if [[ -z $@ ]] ; then 619 if [[ -z $@ ]] ; then
590 useradd ${opts} ${euser} \ 620 useradd ${opts} ${euser} \
591 -c "added by portage for ${PN}" \ 621 -c "added by portage for ${PN}" \
592 || die "enewuser failed" 622 || die "enewuser failed"
595 useradd ${opts} ${euser} "$@" \ 625 useradd ${opts} ${euser} "$@" \
596 || die "enewuser failed" 626 || die "enewuser failed"
597 fi 627 fi
598 ;; 628 ;;
599 esac 629 esac
630
631 if [[ ! -e ${ROOT}/${ehome} ]] ; then
632 einfo " - Creating ${ehome} in ${ROOT}"
633 mkdir -p "${ROOT}/${ehome}"
634 chown ${euser} "${ROOT}/${ehome}"
635 chmod 755 "${ROOT}/${ehome}"
636 fi
637
600 export SANDBOX_ON=${oldsandbox} 638 export SANDBOX_ON=${oldsandbox}
601
602 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
603 then
604 einfo " - Creating ${ehome} in ${D}"
605 dodir ${ehome}
606 fowners ${euser} ${ehome}
607 fperms 755 ${ehome}
608 fi
609} 639}
610 640
611# Simplify/standardize adding groups to the system 641# Simplify/standardize adding groups to the system
612# vapier@gentoo.org 642# vapier@gentoo.org
613# 643#
616# Default values if you do not specify any: 646# Default values if you do not specify any:
617# groupname: REQUIRED ! 647# groupname: REQUIRED !
618# gid: next available (see groupadd(8)) 648# gid: next available (see groupadd(8))
619# extra: none 649# extra: none
620enewgroup() { 650enewgroup() {
651 case ${EBUILD_PHASE} in
652 unpack|compile|test|install)
653 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
654 eerror "Package fails at QA and at life. Please file a bug."
655 die "Bad package! enewgroup is only for use in pkg_* functions!"
656 esac
657
621 # get the group 658 # get the group
622 local egroup="$1"; shift 659 local egroup="$1"; shift
623 if [ -z "${egroup}" ] 660 if [ -z "${egroup}" ]
624 then 661 then
625 eerror "No group specified !" 662 eerror "No group specified !"
626 die "Cannot call enewgroup without a group" 663 die "Cannot call enewgroup without a group"
627 fi 664 fi
628 665
629 # see if group already exists 666 # see if group already exists
630 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 667 if [[ -n $(egetent group "${egroup}") ]]; then
631 then
632 return 0 668 return 0
633 fi 669 fi
634 einfo "Adding group '${egroup}' to your system ..." 670 einfo "Adding group '${egroup}' to your system ..."
635 671
636 # options to pass to useradd 672 # options to pass to useradd
642 then 678 then
643 if [ "${egid}" -gt 0 ] 679 if [ "${egid}" -gt 0 ]
644 then 680 then
645 if [ -z "`egetent group ${egid}`" ] 681 if [ -z "`egetent group ${egid}`" ]
646 then 682 then
647 if [[ "${USERLAND}" == "Darwin" ]]; then 683 if [[ "${CHOST}" == *-darwin* ]]; then
648 opts="${opts} ${egid}" 684 opts="${opts} ${egid}"
649 else 685 else
650 opts="${opts} -g ${egid}" 686 opts="${opts} -g ${egid}"
651 fi 687 fi
652 else 688 else
666 opts="${opts} ${eextra}" 702 opts="${opts} ${eextra}"
667 703
668 # add the group 704 # add the group
669 local oldsandbox="${SANDBOX_ON}" 705 local oldsandbox="${SANDBOX_ON}"
670 export SANDBOX_ON="0" 706 export SANDBOX_ON="0"
671 if [[ "${USERLAND}" == "Darwin" ]]; then 707 case ${CHOST} in
708 *-darwin*)
672 if [ ! -z "${eextra}" ]; 709 if [ ! -z "${eextra}" ];
673 then 710 then
674 einfo "Extra options are not supported on Darwin/OS X yet" 711 einfo "Extra options are not supported on Darwin/OS X yet"
675 einfo "Please report the ebuild along with the info below" 712 einfo "Please report the ebuild along with the info below"
676 einfo "eextra: ${eextra}" 713 einfo "eextra: ${eextra}"
677 die "Required function missing" 714 die "Required function missing"
678 fi 715 fi
679 716
680 # If we need the next available 717 # If we need the next available
681 case ${egid} in 718 case ${egid} in
682 *[!0-9]*) # Non numeric 719 *[!0-9]*) # Non numeric
683 for egid in `jot 898 101`; do 720 for ((egid = 101; egid <= 999; egid++)); do
684 [ -z "`egetent group ${egid}`" ] && break 721 [[ -z $(egetent group ${egid}) ]] && break
685 done 722 done
686 esac 723 esac
687 dscl . create /groups/${egroup} gid ${egid} 724 dscl . create /groups/${egroup} gid ${egid}
688 dscl . create /groups/${egroup} passwd '*' 725 dscl . create /groups/${egroup} passwd '*'
689 elif [[ "${USERLAND}" == "BSD" ]] ; then 726 ;;
727
728 *-freebsd*|*-dragonfly*)
690 case ${egid} in 729 case ${egid} in
691 *[!0-9]*) # Non numeric 730 *[!0-9]*) # Non numeric
692 for egid in `jot 898 101`; do 731 for ((egid = 101; egid <= 999; egid++)); do
693 [ -z "`egetent group ${egid}`" ] && break 732 [[ -z $(egetent group ${egid}) ]] && break
694 done 733 done
695 esac 734 esac
696 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 735 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
697 else 736 ;;
737
738 *-netbsd*)
739 case ${egid} in
740 *[!0-9]*) # Non numeric
741 for ((egid = 101; egid <= 999; egid++)); do
742 [[ -z $(egetent group ${egid}) ]] && break
743 done
744 esac
745 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
746 ;;
747
748 *)
698 groupadd ${opts} ${egroup} || die "enewgroup failed" 749 groupadd ${opts} ${egroup} || die "enewgroup failed"
699 fi 750 ;;
751 esac
700 export SANDBOX_ON="${oldsandbox}" 752 export SANDBOX_ON="${oldsandbox}"
701} 753}
702 754
703# Simple script to replace 'dos2unix' binaries 755# Simple script to replace 'dos2unix' binaries
704# vapier@gentoo.org 756# vapier@gentoo.org
705# 757#
706# edos2unix(file, <more files> ...) 758# edos2unix(file, <more files> ...)
707edos2unix() { 759edos2unix() {
708 for f in "$@" 760 echo "$@" | xargs sed -i 's/\r$//'
709 do
710 cp "${f}" ${T}/edos2unix
711 sed 's/\r$//' ${T}/edos2unix > "${f}"
712 done
713} 761}
714 762
715 763
716############################################################## 764##############################################################
717# START: Handle .desktop files and menu entries # 765# START: Handle .desktop files and menu entries #
718# maybe this should be separated into a new eclass some time # 766# maybe this should be separated into a new eclass some time #
719# lanius@gentoo.org # 767# lanius@gentoo.org #
720############################################################## 768##############################################################
721 769
722# Make a desktop file ! 770# Make a desktop file !
723# Great for making those icons in kde/gnome startmenu ! 771# Great for making those icons in kde/gnome startmenu !
724# Amaze your friends ! Get the women ! Join today ! 772# Amaze your friends ! Get the women ! Join today !
725# 773#
726# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 774# make_desktop_entry(<command>, [name], [icon], [type], [path])
727# 775#
728# binary: what binary does the app run with ? 776# binary: what command does the app run with ?
729# name: the name that will show up in the menu 777# name: the name that will show up in the menu
730# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
731# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
732# a full path to an icon 780# a full path to an icon
733# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
734# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 782# http://www.freedesktop.org/Standards/desktop-entry-spec
735# path: if your app needs to startup in a specific dir 783# path: if your app needs to startup in a specific dir
736make_desktop_entry() { 784make_desktop_entry() {
737 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 785 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
738 786
739 local exec=${1} 787 local exec=${1}
746 local catmaj=${CATEGORY%%-*} 794 local catmaj=${CATEGORY%%-*}
747 local catmin=${CATEGORY##*-} 795 local catmin=${CATEGORY##*-}
748 case ${catmaj} in 796 case ${catmaj} in
749 app) 797 app)
750 case ${catmin} in 798 case ${catmin} in
751 admin) type=System;; 799 admin) type=System;;
752 cdr) type=DiscBurning;; 800 cdr) type=DiscBurning;;
753 dicts) type=Dictionary;; 801 dicts) type=Dictionary;;
754 editors) type=TextEditor;; 802 editors) type=TextEditor;;
755 emacs) type=TextEditor;; 803 emacs) type=TextEditor;;
756 emulation) type=Emulator;; 804 emulation) type=Emulator;;
757 laptop) type=HardwareSettings;; 805 laptop) type=HardwareSettings;;
758 office) type=Office;; 806 office) type=Office;;
759 vim) type=TextEditor;; 807 vim) type=TextEditor;;
760 xemacs) type=TextEditor;; 808 xemacs) type=TextEditor;;
761 *) type=;; 809 *) type=;;
762 esac 810 esac
763 ;; 811 ;;
764 812
765 dev) 813 dev)
766 type="Development" 814 type="Development"
767 ;; 815 ;;
768 816
769 games) 817 games)
770 [[ -z ${path} ]] && path=${GAMES_BINDIR}
771
772 case ${catmin} in 818 case ${catmin} in
773 action) type=ActionGame;; 819 action|fps) type=ActionGame;;
774 arcade) type=ArcadeGame;; 820 arcade) type=ArcadeGame;;
775 board) type=BoardGame;; 821 board) type=BoardGame;;
776 kid) type=KidsGame;; 822 kids) type=KidsGame;;
777 emulation) type=Emulator;; 823 emulation) type=Emulator;;
778 puzzle) type=LogicGame;; 824 puzzle) type=LogicGame;;
779 rpg) type=RolePlaying;; 825 rpg) type=RolePlaying;;
780 roguelike) type=RolePlaying;; 826 roguelike) type=RolePlaying;;
781 simulation) type=Simulation;; 827 simulation) type=Simulation;;
782 sports) type=SportsGame;; 828 sports) type=SportsGame;;
783 strategy) type=StrategyGame;; 829 strategy) type=StrategyGame;;
784 *) type=;; 830 *) type=;;
785 esac 831 esac
786 type="Game;${type}" 832 type="Game;${type}"
787 ;; 833 ;;
788 834
789 mail) 835 mail)
793 media) 839 media)
794 case ${catmin} in 840 case ${catmin} in
795 gfx) type=Graphics;; 841 gfx) type=Graphics;;
796 radio) type=Tuner;; 842 radio) type=Tuner;;
797 sound) type=Audio;; 843 sound) type=Audio;;
798 tv) type=TV;; 844 tv) type=TV;;
799 video) type=Video;; 845 video) type=Video;;
800 *) type=;; 846 *) type=;;
801 esac 847 esac
802 type="AudioVideo;${type}" 848 type="AudioVideo;${type}"
803 ;; 849 ;;
804 850
805 net) 851 net)
806 case ${catmin} in 852 case ${catmin} in
807 dialup) type=Dialup;; 853 dialup) type=Dialup;;
808 ftp) type=FileTransfer;; 854 ftp) type=FileTransfer;;
809 im) type=InstantMessaging;; 855 im) type=InstantMessaging;;
810 irc) type=IRCClient;; 856 irc) type=IRCClient;;
811 mail) type=Email;; 857 mail) type=Email;;
812 news) type=News;; 858 news) type=News;;
813 nntp) type=News;; 859 nntp) type=News;;
814 p2p) type=FileTransfer;; 860 p2p) type=FileTransfer;;
815 *) type=;; 861 *) type=;;
816 esac 862 esac
817 type="Network;${type}" 863 type="Network;${type}"
818 ;; 864 ;;
819 865
820 sci) 866 sci)
821 case ${catmin} in 867 case ${catmin} in
822 astro*) type=Astronomoy;; 868 astro*) type=Astronomy;;
823 bio*) type=Biology;; 869 bio*) type=Biology;;
824 calc*) type=Calculator;; 870 calc*) type=Calculator;;
825 chem*) type=Chemistry;; 871 chem*) type=Chemistry;;
826 geo*) type=Geology;; 872 geo*) type=Geology;;
827 math*) type=Math;; 873 math*) type=Math;;
828 *) type=;; 874 *) type=;;
829 esac 875 esac
830 type="Science;${type}" 876 type="Science;${type}"
831 ;; 877 ;;
832 878
833 www) 879 www)
834 case ${catmin} in 880 case ${catmin} in
835 client) type=WebBrowser;; 881 client) type=WebBrowser;;
836 *) type=;; 882 *) type=;;
837 esac 883 esac
838 type="Network" 884 type="Network"
839 ;; 885 ;;
840 886
841 *) 887 *)
846 if [ "${SLOT}" == "0" ] ; then 892 if [ "${SLOT}" == "0" ] ; then
847 local desktop_name="${PN}" 893 local desktop_name="${PN}"
848 else 894 else
849 local desktop_name="${PN}-${SLOT}" 895 local desktop_name="${PN}-${SLOT}"
850 fi 896 fi
897 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
851 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 898 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
852 899
900 cat <<-EOF > "${desktop}"
853echo "[Desktop Entry] 901 [Desktop Entry]
854Encoding=UTF-8 902 Encoding=UTF-8
855Version=0.9.2 903 Version=0.9.2
856Name=${name} 904 Name=${name}
857Type=Application 905 Type=Application
858Comment=${DESCRIPTION} 906 Comment=${DESCRIPTION}
859Exec=${exec} 907 Exec=${exec}
908 TryExec=${exec%% *}
860Path=${path} 909 Path=${path}
861Icon=${icon} 910 Icon=${icon}
862Categories=Application;${type};" > "${desktop}" 911 Categories=Application;${type};
912 EOF
863 913
914 (
915 # wrap the env here so that the 'insinto' call
916 # doesn't corrupt the env of the caller
864 insinto /usr/share/applications 917 insinto /usr/share/applications
865 doins "${desktop}" 918 doins "${desktop}"
866 919 )
867 return 0
868} 920}
921
922
923# Validate desktop entries using desktop-file-utils
924# Carsten Lohrke <carlo@gentoo.org>
925#
926# Usage: validate_desktop_entries [directory ...]
927
928validate_desktop_entries() {
929 if [[ -x /usr/bin/desktop-file-validate ]] ; then
930 einfo "Checking desktop entry validity"
931 local directories=""
932 for d in /usr/share/applications $@ ; do
933 [[ -d ${D}${d} ]] && directories="${directories} ${D}${d}"
934 done
935 if [[ -n ${directories} ]] ; then
936 for FILE in $(find ${directories} -name "*\.desktop" \
937 -not -path '*.hidden*' | sort -u 2>/dev/null)
938 do
939 local temp=$(desktop-file-validate ${FILE} | grep -v "warning:" | \
940 sed -e "s|error: ||" -e "s|${FILE}:|--|g" )
941 [[ -n $temp ]] && elog ${temp/--/${FILE/${D}/}:}
942 done
943 fi
944 echo ""
945 else
946 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
947 fi
948}
949
869 950
870# Make a GDM/KDM Session file 951# Make a GDM/KDM Session file
871# 952#
872# make_desktop_entry(<title>, <command>) 953# make_session_desktop(<title>, <command>)
873# title: File to execute to start the Window Manager 954# title: File to execute to start the Window Manager
874# command: Name of the Window Manager 955# command: Name of the Window Manager
875 956
876make_session_desktop() { 957make_session_desktop() {
877 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 958 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
879 960
880 local title=$1 961 local title=$1
881 local command=$2 962 local command=$2
882 local desktop=${T}/${wm}.desktop 963 local desktop=${T}/${wm}.desktop
883 964
965 cat <<-EOF > "${desktop}"
884echo "[Desktop Entry] 966 [Desktop Entry]
885Encoding=UTF-8 967 Encoding=UTF-8
886Name=${title} 968 Name=${title}
887Comment=This session logs you into ${title} 969 Comment=This session logs you into ${title}
888Exec=${command} 970 Exec=${command}
889TryExec=${command} 971 TryExec=${command}
890Type=Application" > "${desktop}" 972 Type=Application
973 EOF
891 974
975 (
976 # wrap the env here so that the 'insinto' call
977 # doesn't corrupt the env of the caller
892 insinto /usr/share/xsessions 978 insinto /usr/share/xsessions
893 doins "${desktop}" 979 doins "${desktop}"
980 )
894} 981}
895 982
896domenu() { 983domenu() {
984 (
985 # wrap the env here so that the 'insinto' call
986 # doesn't corrupt the env of the caller
897 local i j 987 local i j ret=0
898 insinto /usr/share/applications 988 insinto /usr/share/applications
899 for i in "$@" ; do 989 for i in "$@" ; do
900 if [[ -f ${i} ]] ; then 990 if [[ -f ${i} ]] ; then
901 doins "${i}" 991 doins "${i}"
992 ((ret+=$?))
902 elif [[ -d ${i} ]] ; then 993 elif [[ -d ${i} ]] ; then
903 for j in "${i}"/*.desktop ; do 994 for j in "${i}"/*.desktop ; do
904 doins "${j}" 995 doins "${j}"
996 ((ret+=$?))
905 done 997 done
906 fi 998 fi
907 done 999 done
1000 exit ${ret}
1001 )
908} 1002}
909newmenu() { 1003newmenu() {
1004 (
1005 # wrap the env here so that the 'insinto' call
1006 # doesn't corrupt the env of the caller
910 insinto /usr/share/applications 1007 insinto /usr/share/applications
911 newins "$1" "$2" 1008 newins "$@"
1009 )
912} 1010}
913 1011
914doicon() { 1012doicon() {
1013 (
1014 # wrap the env here so that the 'insinto' call
1015 # doesn't corrupt the env of the caller
915 local i j 1016 local i j ret
916 insinto /usr/share/pixmaps 1017 insinto /usr/share/pixmaps
917 for i in "$@" ; do 1018 for i in "$@" ; do
918 if [[ -f ${i} ]] ; then 1019 if [[ -f ${i} ]] ; then
919 doins "${i}" 1020 doins "${i}"
1021 ((ret+=$?))
920 elif [[ -d ${i} ]] ; then 1022 elif [[ -d ${i} ]] ; then
921 for j in "${i}"/*.png ; do 1023 for j in "${i}"/*.png ; do
922 doins "${j}" 1024 doins "${j}"
1025 ((ret+=$?))
923 done 1026 done
924 fi 1027 fi
925 done 1028 done
1029 exit ${ret}
1030 )
926} 1031}
927newicon() { 1032newicon() {
1033 (
1034 # wrap the env here so that the 'insinto' call
1035 # doesn't corrupt the env of the caller
928 insinto /usr/share/pixmaps 1036 insinto /usr/share/pixmaps
929 newins "$1" "$2" 1037 newins "$@"
1038 )
930} 1039}
931 1040
932############################################################## 1041##############################################################
933# END: Handle .desktop files and menu entries # 1042# END: Handle .desktop files and menu entries #
934############################################################## 1043##############################################################
935 1044
936 1045
937# for internal use only (unpack_pdv and unpack_makeself) 1046# for internal use only (unpack_pdv and unpack_makeself)
938find_unpackable_file() { 1047find_unpackable_file() {
939 local src="$1" 1048 local src=$1
940 if [ -z "${src}" ] 1049 if [[ -z ${src} ]] ; then
941 then
942 src="${DISTDIR}/${A}" 1050 src=${DISTDIR}/${A}
943 else 1051 else
944 if [ -e "${DISTDIR}/${src}" ] 1052 if [[ -e ${DISTDIR}/${src} ]] ; then
945 then
946 src="${DISTDIR}/${src}" 1053 src=${DISTDIR}/${src}
947 elif [ -e "${PWD}/${src}" ] 1054 elif [[ -e ${PWD}/${src} ]] ; then
948 then
949 src="${PWD}/${src}" 1055 src=${PWD}/${src}
950 elif [ -e "${src}" ] 1056 elif [[ -e ${src} ]] ; then
951 then
952 src="${src}" 1057 src=${src}
953 fi
954 fi 1058 fi
955 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 1059 fi
1060 [[ ! -e ${src} ]] && return 1
956 echo "${src}" 1061 echo "${src}"
957} 1062}
958 1063
959# Unpack those pesky pdv generated files ... 1064# Unpack those pesky pdv generated files ...
960# They're self-unpacking programs with the binary package stuffed in 1065# They're self-unpacking programs with the binary package stuffed in
961# the middle of the archive. Valve seems to use it a lot ... too bad 1066# the middle of the archive. Valve seems to use it a lot ... too bad
962# it seems to like to segfault a lot :(. So lets take it apart ourselves. 1067# it seems to like to segfault a lot :(. So lets take it apart ourselves.
963# 1068#
964# Usage: unpack_pdv [file to unpack] [size of off_t] 1069# Usage: unpack_pdv [file to unpack] [size of off_t]
965# - you have to specify the off_t size ... i have no idea how to extract that 1070# - you have to specify the off_t size ... i have no idea how to extract that
966# information out of the binary executable myself. basically you pass in 1071# information out of the binary executable myself. basically you pass in
967# the size of the off_t type (in bytes) on the machine that built the pdv 1072# the size of the off_t type (in bytes) on the machine that built the pdv
968# archive. one way to determine this is by running the following commands: 1073# archive. one way to determine this is by running the following commands:
969# strings <pdv archive> | grep lseek 1074# strings <pdv archive> | grep lseek
970# strace -elseek <pdv archive> 1075# strace -elseek <pdv archive>
971# basically look for the first lseek command (we do the strings/grep because 1076# basically look for the first lseek command (we do the strings/grep because
972# sometimes the function call is _llseek or something) and steal the 2nd 1077# sometimes the function call is _llseek or something) and steal the 2nd
973# parameter. here is an example: 1078# parameter. here is an example:
974# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1079# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
975# lseek 1080# lseek
976# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1081# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
977# lseek(3, -4, SEEK_END) = 2981250 1082# lseek(3, -4, SEEK_END) = 2981250
978# thus we would pass in the value of '4' as the second parameter. 1083# thus we would pass in the value of '4' as the second parameter.
979unpack_pdv() { 1084unpack_pdv() {
980 local src="`find_unpackable_file $1`" 1085 local src=$(find_unpackable_file "$1")
981 local sizeoff_t="$2" 1086 local sizeoff_t=$2
982 1087
1088 [[ -z ${src} ]] && die "Could not locate source for '$1'"
983 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1089 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
984 1090
985 local shrtsrc="`basename ${src}`" 1091 local shrtsrc=$(basename "${src}")
986 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1092 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
987 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1093 local metaskip=$(tail -c ${sizeoff_t} "${src}" | hexdump -e \"%i\")
988 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1094 local tailskip=$(tail -c $((${sizeoff_t}*2)) "${src}" | head -c ${sizeoff_t} | hexdump -e \"%i\")
989 1095
990 # grab metadata for debug reasons 1096 # grab metadata for debug reasons
991 local metafile="$(emktemp)" 1097 local metafile=$(emktemp)
992 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1098 tail -c +$((${metaskip}+1)) "${src}" > "${metafile}"
993 1099
994 # rip out the final file name from the metadata 1100 # rip out the final file name from the metadata
995 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1101 local datafile=$(tail -c +$((${metaskip}+1)) "${src}" | strings | head -n 1)
996 datafile="`basename ${datafile}`" 1102 datafile=$(basename "${datafile}")
997 1103
998 # now lets uncompress/untar the file if need be 1104 # now lets uncompress/untar the file if need be
999 local tmpfile="$(emktemp)" 1105 local tmpfile=$(emktemp)
1000 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1106 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1001 1107
1002 local iscompressed="`file -b ${tmpfile}`" 1108 local iscompressed=$(file -b "${tmpfile}")
1003 if [ "${iscompressed:0:8}" == "compress" ] ; then 1109 if [[ ${iscompressed:0:8} == "compress" ]] ; then
1004 iscompressed=1 1110 iscompressed=1
1005 mv ${tmpfile}{,.Z} 1111 mv ${tmpfile}{,.Z}
1006 gunzip ${tmpfile} 1112 gunzip ${tmpfile}
1007 else 1113 else
1008 iscompressed=0 1114 iscompressed=0
1009 fi 1115 fi
1010 local istar="`file -b ${tmpfile}`" 1116 local istar=$(file -b "${tmpfile}")
1011 if [ "${istar:0:9}" == "POSIX tar" ] ; then 1117 if [[ ${istar:0:9} == "POSIX tar" ]] ; then
1012 istar=1 1118 istar=1
1013 else 1119 else
1014 istar=0 1120 istar=0
1015 fi 1121 fi
1016 1122
1052# many other game companies. 1158# many other game companies.
1053# 1159#
1054# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1160# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1055# - If the file is not specified then unpack will utilize ${A}. 1161# - If the file is not specified then unpack will utilize ${A}.
1056# - If the offset is not specified then we will attempt to extract 1162# - If the offset is not specified then we will attempt to extract
1057# the proper offset from the script itself. 1163# the proper offset from the script itself.
1058unpack_makeself() { 1164unpack_makeself() {
1165 local src_input=${1:-${A}}
1059 local src="$(find_unpackable_file "$1")" 1166 local src=$(find_unpackable_file "${src_input}")
1060 local skip="$2" 1167 local skip=$2
1061 local exe="$3" 1168 local exe=$3
1062 1169
1170 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1171
1063 local shrtsrc="$(basename "${src}")" 1172 local shrtsrc=$(basename "${src}")
1064 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1173 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1065 if [ -z "${skip}" ] 1174 if [[ -z ${skip} ]] ; then
1066 then
1067 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1175 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1068 local skip=0 1176 local skip=0
1069 exe=tail 1177 exe=tail
1070 case ${ver} in 1178 case ${ver} in
1071 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1179 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1072 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1180 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1073 ;; 1181 ;;
1074 2.0|2.0.1) 1182 2.0|2.0.1)
1075 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1183 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1076 ;; 1184 ;;
1084 ;; 1192 ;;
1085 2.1.3) 1193 2.1.3)
1086 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1194 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1087 let skip="skip + 1" 1195 let skip="skip + 1"
1088 ;; 1196 ;;
1089 2.1.4) 1197 2.1.4|2.1.5)
1090 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1198 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1091 skip=$(head -n ${skip} "${src}" | wc -c) 1199 skip=$(head -n ${skip} "${src}" | wc -c)
1092 exe="dd" 1200 exe="dd"
1093 ;; 1201 ;;
1094 *) 1202 *)
1106 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1214 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1107 *) die "makeself cant handle exe '${exe}'" 1215 *) die "makeself cant handle exe '${exe}'"
1108 esac 1216 esac
1109 1217
1110 # lets grab the first few bytes of the file to figure out what kind of archive it is 1218 # lets grab the first few bytes of the file to figure out what kind of archive it is
1111 local tmpfile="$(emktemp)" 1219 local tmpfile=$(emktemp)
1112 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1220 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1113 local filetype="$(file -b "${tmpfile}")" 1221 local filetype=$(file -b "${tmpfile}")
1114 case ${filetype} in 1222 case ${filetype} in
1115 *tar\ archive) 1223 *tar\ archive*)
1116 eval ${exe} | tar --no-same-owner -xf - 1224 eval ${exe} | tar --no-same-owner -xf -
1117 ;; 1225 ;;
1118 bzip2*) 1226 bzip2*)
1119 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1227 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1120 ;; 1228 ;;
1139check_license() { 1247check_license() {
1140 local lic=$1 1248 local lic=$1
1141 if [ -z "${lic}" ] ; then 1249 if [ -z "${lic}" ] ; then
1142 lic="${PORTDIR}/licenses/${LICENSE}" 1250 lic="${PORTDIR}/licenses/${LICENSE}"
1143 else 1251 else
1144 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1252 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1145 lic="${PORTDIR}/licenses/${src}" 1253 lic="${PORTDIR}/licenses/${lic}"
1146 elif [ -e "${PWD}/${src}" ] ; then 1254 elif [ -e "${PWD}/${lic}" ] ; then
1147 lic="${PWD}/${src}" 1255 lic="${PWD}/${lic}"
1148 elif [ -e "${src}" ] ; then 1256 elif [ -e "${lic}" ] ; then
1149 lic="${src}" 1257 lic="${lic}"
1150 fi
1151 fi 1258 fi
1259 fi
1152 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1260 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1153 local l="`basename ${lic}`" 1261 local l="`basename ${lic}`"
1154 1262
1155 # here is where we check for the licenses the user already 1263 # here is where we check for the licenses the user already
1156 # accepted ... if we don't find a match, we make the user accept 1264 # accepted ... if we don't find a match, we make the user accept
1157 local shopts=$- 1265 local shopts=$-
1158 local alic 1266 local alic
1159 set -o noglob #so that bash doesn't expand "*" 1267 set -o noglob #so that bash doesn't expand "*"
1160 for alic in ${ACCEPT_LICENSE} ; do 1268 for alic in ${ACCEPT_LICENSE} ; do
1161 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1269 if [[ ${alic} == ${l} ]]; then
1162 set +o noglob; set -${shopts} #reset old shell opts 1270 set +o noglob; set -${shopts} #reset old shell opts
1163 return 0 1271 return 0
1164 fi 1272 fi
1165 done 1273 done
1166 set +o noglob; set -$shopts #reset old shell opts 1274 set +o noglob; set -$shopts #reset old shell opts
1167 1275
1168 local licmsg="$(emktemp)" 1276 local licmsg=$(emktemp)
1169 cat << EOF > ${licmsg} 1277 cat <<-EOF > ${licmsg}
1170********************************************************** 1278 **********************************************************
1171The following license outlines the terms of use of this 1279 The following license outlines the terms of use of this
1172package. You MUST accept this license for installation to 1280 package. You MUST accept this license for installation to
1173continue. When you are done viewing, hit 'q'. If you 1281 continue. When you are done viewing, hit 'q'. If you
1174CTRL+C out of this, the install will not run! 1282 CTRL+C out of this, the install will not run!
1175********************************************************** 1283 **********************************************************
1176 1284
1177EOF 1285 EOF
1178 cat ${lic} >> ${licmsg} 1286 cat ${lic} >> ${licmsg}
1179 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}" 1287 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}"
1180 einfon "Do you accept the terms of this license (${l})? [yes/no] " 1288 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1181 read alic 1289 read alic
1182 case ${alic} in 1290 case ${alic} in
1199# and when the function returns, you can assume that the cd has been 1307# and when the function returns, you can assume that the cd has been
1200# found at CDROM_ROOT. 1308# found at CDROM_ROOT.
1201# 1309#
1202# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1310# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1203# etc... if you want to give the cds better names, then just export 1311# etc... if you want to give the cds better names, then just export
1204# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1312# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1313# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1314# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1315# CDROM_NAME_2="data cd"
1316# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1205# 1317#
1206# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1318# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1207# 1319#
1208# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1320# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1209# - this will attempt to locate a cd based upon a file that is on 1321# - this will attempt to locate a cd based upon a file that is on
1210# the cd ... the more files you give this function, the more cds 1322# the cd ... the more files you give this function, the more cds
1211# the cdrom functions will handle 1323# the cdrom functions will handle
1212cdrom_get_cds() { 1324cdrom_get_cds() {
1213 # first we figure out how many cds we're dealing with by 1325 # first we figure out how many cds we're dealing with by
1214 # the # of files they gave us 1326 # the # of files they gave us
1215 local cdcnt=0 1327 local cdcnt=0
1216 local f= 1328 local f=
1217 for f in "$@" ; do 1329 for f in "$@" ; do
1218 cdcnt=$((cdcnt + 1)) 1330 ((++cdcnt))
1219 export CDROM_CHECK_${cdcnt}="$f" 1331 export CDROM_CHECK_${cdcnt}="$f"
1220 done 1332 done
1221 export CDROM_TOTAL_CDS=${cdcnt} 1333 export CDROM_TOTAL_CDS=${cdcnt}
1222 export CDROM_CURRENT_CD=1 1334 export CDROM_CURRENT_CD=1
1223 1335
1224 # now we see if the user gave use CD_ROOT ... 1336 # now we see if the user gave use CD_ROOT ...
1225 # if they did, let's just believe them that it's correct 1337 # if they did, let's just believe them that it's correct
1226 if [[ ! -z ${CD_ROOT} ]] ; then
1227 export CDROM_ROOT=${CD_ROOT}
1228 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1229 return
1230 fi
1231 # do the same for CD_ROOT_X
1232 if [[ ! -z ${CD_ROOT_1} ]] ; then 1338 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1233 local var= 1339 local var=
1234 cdcnt=0 1340 cdcnt=0
1235 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1341 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1236 cdcnt=$((cdcnt + 1)) 1342 ((++cdcnt))
1237 var="CD_ROOT_${cdcnt}" 1343 var="CD_ROOT_${cdcnt}"
1344 [[ -z ${!var} ]] && var="CD_ROOT"
1238 if [[ -z ${!var} ]] ; then 1345 if [[ -z ${!var} ]] ; then
1239 eerror "You must either use just the CD_ROOT" 1346 eerror "You must either use just the CD_ROOT"
1240 eerror "or specify ALL the CD_ROOT_X variables." 1347 eerror "or specify ALL the CD_ROOT_X variables."
1241 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1348 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1242 die "could not locate CD_ROOT_${cdcnt}" 1349 die "could not locate CD_ROOT_${cdcnt}"
1243 fi 1350 fi
1244 export CDROM_ROOTS_${cdcnt}="${!var}"
1245 done 1351 done
1246 export CDROM_ROOT=${CDROM_ROOTS_1} 1352 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1247 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1353 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1354 export CDROM_SET=-1
1355 for f in ${CDROM_CHECK_1//:/ } ; do
1356 ((++CDROM_SET))
1357 [[ -e ${CD_ROOT}/${f} ]] && break
1358 done
1359 export CDROM_MATCH=${f}
1248 return 1360 return
1249 fi 1361 fi
1250 1362
1363 # User didn't help us out so lets make sure they know they can
1364 # simplify the whole process ...
1251 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1365 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1252 einfon "This ebuild will need the " 1366 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1253 if [[ -z ${CDROM_NAME} ]] ; then
1254 echo "cdrom for ${PN}."
1255 else
1256 echo "${CDROM_NAME}."
1257 fi
1258 echo 1367 echo
1259 einfo "If you do not have the CD, but have the data files" 1368 einfo "If you do not have the CD, but have the data files"
1260 einfo "mounted somewhere on your filesystem, just export" 1369 einfo "mounted somewhere on your filesystem, just export"
1261 einfo "the variable CD_ROOT so that it points to the" 1370 einfo "the variable CD_ROOT so that it points to the"
1262 einfo "directory containing the files." 1371 einfo "directory containing the files."
1263 echo 1372 echo
1264 einfo "For example:" 1373 einfo "For example:"
1265 einfo "export CD_ROOT=/mnt/cdrom" 1374 einfo "export CD_ROOT=/mnt/cdrom"
1266 echo 1375 echo
1267 else 1376 else
1377 if [[ -n ${CDROM_NAME_SET} ]] ; then
1378 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1379 cdcnt=0
1380 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1381 ((++cdcnt))
1382 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1383 done
1384 fi
1385
1268 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1386 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1269 cdcnt=0 1387 cdcnt=0
1270 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1388 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1271 cdcnt=$((cdcnt + 1)) 1389 ((++cdcnt))
1272 var="CDROM_NAME_${cdcnt}" 1390 var="CDROM_NAME_${cdcnt}"
1273 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1391 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1274 done 1392 done
1275 echo 1393 echo
1276 einfo "If you do not have the CDs, but have the data files" 1394 einfo "If you do not have the CDs, but have the data files"
1277 einfo "mounted somewhere on your filesystem, just export" 1395 einfo "mounted somewhere on your filesystem, just export"
1278 einfo "the following variables so they point to the right place:" 1396 einfo "the following variables so they point to the right place:"
1279 einfon "" 1397 einfon ""
1280 cdcnt=0 1398 cdcnt=0
1281 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1399 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1282 cdcnt=$((cdcnt + 1)) 1400 ((++cdcnt))
1283 echo -n " CD_ROOT_${cdcnt}" 1401 echo -n " CD_ROOT_${cdcnt}"
1284 done 1402 done
1285 echo 1403 echo
1286 einfo "Or, if you have all the files in the same place, or" 1404 einfo "Or, if you have all the files in the same place, or"
1287 einfo "you only have one cdrom, you can export CD_ROOT" 1405 einfo "you only have one cdrom, you can export CD_ROOT"
1290 echo 1408 echo
1291 einfo "For example:" 1409 einfo "For example:"
1292 einfo "export CD_ROOT_1=/mnt/cdrom" 1410 einfo "export CD_ROOT_1=/mnt/cdrom"
1293 echo 1411 echo
1294 fi 1412 fi
1413
1414 export CDROM_SET=""
1295 export CDROM_CURRENT_CD=0 1415 export CDROM_CURRENT_CD=0
1296 cdrom_load_next_cd 1416 cdrom_load_next_cd
1297} 1417}
1298 1418
1299# this is only used when you need access to more than one cd. 1419# this is only used when you need access to more than one cd.
1300# when you have finished using the first cd, just call this function. 1420# when you have finished using the first cd, just call this function.
1301# when it returns, CDROM_ROOT will be pointing to the second cd. 1421# when it returns, CDROM_ROOT will be pointing to the second cd.
1302# remember, you can only go forward in the cd chain, you can't go back. 1422# remember, you can only go forward in the cd chain, you can't go back.
1303cdrom_load_next_cd() { 1423cdrom_load_next_cd() {
1304 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1305 local var= 1424 local var
1306 1425 ((++CDROM_CURRENT_CD))
1307 if [[ ! -z ${CD_ROOT} ]] ; then
1308 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1309 return
1310 fi
1311 1426
1312 unset CDROM_ROOT 1427 unset CDROM_ROOT
1313 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1428 var=CD_ROOT_${CDROM_CURRENT_CD}
1429 [[ -z ${!var} ]] && var="CD_ROOT"
1314 if [[ -z ${!var} ]] ; then 1430 if [[ -z ${!var} ]] ; then
1315 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1431 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1316 cdrom_locate_file_on_cd ${!var} 1432 _cdrom_locate_file_on_cd ${!var}
1317 else 1433 else
1318 export CDROM_ROOT=${!var} 1434 export CDROM_ROOT=${!var}
1319 fi 1435 fi
1320 1436
1321 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1437 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1326# all it does is try to locate a give file on a cd ... if the cd isn't 1442# all it does is try to locate a give file on a cd ... if the cd isn't
1327# found, then a message asking for the user to insert the cdrom will be 1443# found, then a message asking for the user to insert the cdrom will be
1328# displayed and we'll hang out here until: 1444# displayed and we'll hang out here until:
1329# (1) the file is found on a mounted cdrom 1445# (1) the file is found on a mounted cdrom
1330# (2) the user hits CTRL+C 1446# (2) the user hits CTRL+C
1331cdrom_locate_file_on_cd() { 1447_cdrom_locate_file_on_cd() {
1448 local mline=""
1449 local showedmsg=0
1450
1332 while [[ -z ${CDROM_ROOT} ]] ; do 1451 while [[ -z ${CDROM_ROOT} ]] ; do
1452 local i=0
1453 local -a cdset=(${*//:/ })
1454 if [[ -n ${CDROM_SET} ]] ; then
1455 cdset=(${cdset[${CDROM_SET}]})
1456 fi
1457
1458 while [[ -n ${cdset[${i}]} ]] ; do
1333 local dir="$(dirname ${@})" 1459 local dir=$(dirname ${cdset[${i}]})
1334 local file="$(basename ${@})" 1460 local file=$(basename ${cdset[${i}]})
1335 local mline=""
1336 local showedmsg=0
1337 1461
1338 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1462 local point= node= fs= foo=
1339 [[ -d ${mline}/${dir} ]] || continue 1463 while read point node fs foo ; do
1464 [[ " cd9660 iso9660 " != *" ${fs} "* ]] && \
1465 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1466 && continue
1467 point=${point//\040/ }
1340 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1468 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1341 && export CDROM_ROOT=${mline} 1469 export CDROM_ROOT=${point}
1470 export CDROM_SET=${i}
1471 export CDROM_MATCH=${cdset[${i}]}
1472 return
1473 done <<< "$(get_mounts)"
1474
1475 ((++i))
1342 done 1476 done
1343 1477
1344 if [[ -z ${CDROM_ROOT} ]] ; then
1345 echo 1478 echo
1346 if [[ ${showedmsg} -eq 0 ]] ; then 1479 if [[ ${showedmsg} -eq 0 ]] ; then
1347 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1480 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1348 if [[ -z ${CDROM_NAME} ]] ; then 1481 if [[ -z ${CDROM_NAME} ]] ; then
1349 einfo "Please insert the cdrom for ${PN} now !" 1482 einfo "Please insert+mount the cdrom for ${PN} now !"
1350 else
1351 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1352 fi
1353 else 1483 else
1354 if [[ -z ${CDROM_NAME_1} ]] ; then
1355 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1356 else
1357 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1358 einfo "Please insert+mount the ${!var} cdrom now !" 1484 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1359 fi
1360 fi 1485 fi
1361 showedmsg=1 1486 else
1487 if [[ -z ${CDROM_NAME_1} ]] ; then
1488 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1489 else
1490 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1491 einfo "Please insert+mount the ${!var} cdrom now !"
1492 fi
1362 fi 1493 fi
1494 showedmsg=1
1495 fi
1363 einfo "Press return to scan for the cd again" 1496 einfo "Press return to scan for the cd again"
1364 einfo "or hit CTRL+C to abort the emerge." 1497 einfo "or hit CTRL+C to abort the emerge."
1365 echo 1498 echo
1366 einfo "If you are having trouble with the detection" 1499 einfo "If you are having trouble with the detection"
1367 einfo "of your CD, it is possible that you do not have" 1500 einfo "of your CD, it is possible that you do not have"
1368 einfo "Joliet support enabled in your kernel. Please" 1501 einfo "Joliet support enabled in your kernel. Please"
1369 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1502 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1370 read 1503 read || die "something is screwed with your system"
1371 fi
1372 done 1504 done
1373} 1505}
1374 1506
1375# Make sure that LINGUAS only contains languages that 1507# Make sure that LINGUAS only contains languages that
1376# a package can support 1508# a package can support
1377# 1509#
1378# usage: strip-linguas <allow LINGUAS> 1510# usage: strip-linguas <allow LINGUAS>
1379# strip-linguas -i <directories of .po files> 1511# strip-linguas -i <directories of .po files>
1380# strip-linguas -u <directories of .po files> 1512# strip-linguas -u <directories of .po files>
1381# 1513#
1382# The first form allows you to specify a list of LINGUAS. 1514# The first form allows you to specify a list of LINGUAS.
1383# The -i builds a list of po files found in all the 1515# The -i builds a list of po files found in all the
1384# directories and uses the intersection of the lists. 1516# directories and uses the intersection of the lists.
1385# The -u builds a list of po files found in all the 1517# The -u builds a list of po files found in all the
1386# directories and uses the union of the lists. 1518# directories and uses the union of the lists.
1387strip-linguas() { 1519strip-linguas() {
1388 local ls newls 1520 local ls newls nols
1389 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1521 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1390 local op=$1; shift 1522 local op=$1; shift
1391 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1523 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1392 local d f 1524 local d f
1393 for d in "$@" ; do 1525 for d in "$@" ; do
1394 if [[ ${op} == "-u" ]] ; then 1526 if [[ ${op} == "-u" ]] ; then
1395 newls=${ls} 1527 newls=${ls}
1396 else 1528 else
1397 newls="" 1529 newls=""
1398 fi 1530 fi
1399 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1531 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1400 if [[ ${op} == "-i" ]] ; then 1532 if [[ ${op} == "-i" ]] ; then
1401 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1533 hasq ${f} ${ls} && newls="${newls} ${f}"
1402 else 1534 else
1403 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1535 hasq ${f} ${ls} || newls="${newls} ${f}"
1404 fi 1536 fi
1405 done 1537 done
1406 ls=${newls} 1538 ls=${newls}
1407 done 1539 done
1408 ls=${ls//.po}
1409 else 1540 else
1410 ls=$@ 1541 ls="$@"
1411 fi 1542 fi
1412 1543
1413 ls=" ${ls} " 1544 nols=""
1414 newls="" 1545 newls=""
1415 for f in ${LINGUAS} ; do 1546 for f in ${LINGUAS} ; do
1416 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1547 if hasq ${f} ${ls} ; then
1417 newls="${newls} ${f}" 1548 newls="${newls} ${f}"
1418 else 1549 else
1419 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1550 nols="${nols} ${f}"
1420 fi 1551 fi
1421 done 1552 done
1422 if [[ -z ${newls} ]] ; then 1553 [[ -n ${nols} ]] \
1423 export LINGUAS="" 1554 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1424 else
1425 export LINGUAS=${newls:1} 1555 export LINGUAS=${newls:1}
1426 fi
1427} 1556}
1428 1557
1429# moved from kernel.eclass since they are generally useful outside of 1558# moved from kernel.eclass since they are generally useful outside of
1430# kernel.eclass -iggy (20041002) 1559# kernel.eclass -iggy (20041002)
1431 1560
1438 while ((i--)) ; do 1567 while ((i--)) ; do
1439 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1568 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1440 done 1569 done
1441 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1570 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1442 case ${ARCH} in 1571 case ${ARCH} in
1443 x86) export ARCH="i386";; 1572 x86) export ARCH="i386";;
1444 amd64) export ARCH="x86_64";; 1573 amd64) export ARCH="x86_64";;
1445 hppa) export ARCH="parisc";; 1574 hppa) export ARCH="parisc";;
1446 mips) export ARCH="mips";; 1575 mips) export ARCH="mips";;
1447 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one! 1576 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
1448 *) export ARCH="${ARCH}";; 1577 *) export ARCH="${ARCH}";;
1449 esac 1578 esac
1450} 1579}
1451 1580
1452# set's ARCH back to what portage expects 1581# set's ARCH back to what portage expects
1453set_arch_to_portage() { 1582set_arch_to_portage() {
1460 1589
1461# Jeremy Huddleston <eradicator@gentoo.org>: 1590# Jeremy Huddleston <eradicator@gentoo.org>:
1462# preserve_old_lib /path/to/libblah.so.0 1591# preserve_old_lib /path/to/libblah.so.0
1463# preserve_old_lib_notify /path/to/libblah.so.0 1592# preserve_old_lib_notify /path/to/libblah.so.0
1464# 1593#
1465# These functions are useful when a lib in your package changes --soname. Such 1594# These functions are useful when a lib in your package changes --library. Such
1466# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1595# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1467# would break packages that link against it. Most people get around this 1596# would break packages that link against it. Most people get around this
1468# by using the portage SLOT mechanism, but that is not always a relevant 1597# by using the portage SLOT mechanism, but that is not always a relevant
1469# solution, so instead you can add the following to your ebuilds: 1598# solution, so instead you can add the following to your ebuilds:
1470# 1599#
1471# src_install() { 1600# pkg_preinst() {
1472# ... 1601# ...
1473# preserve_old_lib /usr/$(get_libdir)/libogg.so.0 1602# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1474# ... 1603# ...
1475# } 1604# }
1476# 1605#
1479# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0 1608# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1480# ... 1609# ...
1481# } 1610# }
1482 1611
1483preserve_old_lib() { 1612preserve_old_lib() {
1484 LIB=$1 1613 if [[ ${EBUILD_PHASE} != "preinst" ]] ; then
1614 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1615 die "Invalid preserve_old_lib() usage"
1616 fi
1617 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1485 1618
1486 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1619 local lib dir
1487 SONAME=`basename ${LIB}` 1620 for lib in "$@" ; do
1488 DIRNAME=`dirname ${LIB}` 1621 [[ -e ${ROOT}/${lib} ]] || continue
1489 1622 dir=${lib%/*}
1490 dodir ${DIRNAME} 1623 dodir ${dir} || die "dodir ${dir} failed"
1491 cp ${ROOT}${LIB} ${D}${DIRNAME} 1624 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
1492 touch ${D}${LIB} 1625 touch "${D}"/${lib}
1493 fi 1626 done
1494} 1627}
1495 1628
1496preserve_old_lib_notify() { 1629preserve_old_lib_notify() {
1497 LIB=$1 1630 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1631 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1632 die "Invalid preserve_old_lib_notify() usage"
1633 fi
1498 1634
1499 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1635 local lib notice=0
1500 SONAME=`basename ${LIB}` 1636 for lib in "$@" ; do
1501 1637 [[ -e ${ROOT}/${lib} ]] || continue
1638 if [[ ${notice} -eq 0 ]] ; then
1639 notice=1
1502 einfo "An old version of an installed library was detected on your system." 1640 ewarn "Old versions of installed libraries were detected on your system."
1503 einfo "In order to avoid breaking packages that link against it, this older version" 1641 ewarn "In order to avoid breaking packages that depend on these old libs,"
1504 einfo "is not being removed. In order to make full use of this newer version," 1642 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1505 einfo "you will need to execute the following command:" 1643 ewarn "in order to remove these old dependencies. If you do not have this"
1506 einfo " revdep-rebuild --soname ${SONAME}" 1644 ewarn "helper program, simply emerge the 'gentoolkit' package."
1507 einfo 1645 ewarn
1508 einfo "After doing that, you can safely remove ${LIB}"
1509 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1510 fi 1646 fi
1647 ewarn " # revdep-rebuild --library ${lib##*/}"
1648 done
1511} 1649}
1512 1650
1513# Hack for people to figure out if a package was built with 1651# Hack for people to figure out if a package was built with
1514# certain USE flags 1652# certain USE flags
1515# 1653#
1516# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1654# Usage: built_with_use [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1517# ex: built_with_use xchat gtk2 1655# ex: built_with_use xchat gtk2
1518# 1656#
1519# Flags: -a all USE flags should be utilized 1657# Flags: -a all USE flags should be utilized
1520# -o at least one USE flag should be utilized 1658# -o at least one USE flag should be utilized
1659# --missing peform the specified action if the flag is not in IUSE (true/false/die)
1660# --hidden USE flag we're checking is hidden expanded so it isnt in IUSE
1521# Note: the default flag is '-a' 1661# Note: the default flag is '-a'
1522built_with_use() { 1662built_with_use() {
1663 local hidden="no"
1664 if [[ $1 == "--hidden" ]] ; then
1665 hidden="yes"
1666 shift
1667 fi
1668
1669 local missing_action="die"
1670 if [[ $1 == "--missing" ]] ; then
1671 missing_action=$2
1672 shift ; shift
1673 case ${missing_action} in
1674 true|false|die) ;;
1675 *) die "unknown action '${missing_action}'";;
1676 esac
1677 fi
1678
1523 local opt=$1 1679 local opt=$1
1524 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1680 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1525 1681
1526 local PKG=$(best_version $1) 1682 local PKG=$(best_version $1)
1683 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1527 shift 1684 shift
1528 1685
1529 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1686 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1530 [[ ! -e ${USEFILE} ]] && return 1 1687 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1688
1689 # if the IUSE file doesn't exist, the read will error out, we need to handle
1690 # this gracefully
1691 if [[ ! -e ${USEFILE} ]] || [[ ! -e ${IUSEFILE} && ${hidden} == "no" ]] ; then
1692 case ${missing_action} in
1693 true) return 0;;
1694 false) return 1;;
1695 die) die "Unable to determine what USE flags $PKG was built with";;
1696 esac
1697 fi
1698
1699 if [[ ${hidden} == "no" ]] ; then
1700 local IUSE_BUILT=$(<${IUSEFILE})
1701 # Don't check USE_EXPAND #147237
1702 local expand
1703 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1704 if [[ $1 == ${expand}_* ]] ; then
1705 expand=""
1706 break
1707 fi
1708 done
1709 if [[ -n ${expand} ]] ; then
1710 if ! has $1 ${IUSE_BUILT} ; then
1711 case ${missing_action} in
1712 true) return 0;;
1713 false) return 1;;
1714 die) die "$PKG does not actually support the $1 USE flag!";;
1715 esac
1716 fi
1717 fi
1718 fi
1531 1719
1532 local USE_BUILT=$(<${USEFILE}) 1720 local USE_BUILT=$(<${USEFILE})
1533 while [[ $# -gt 0 ]] ; do 1721 while [[ $# -gt 0 ]] ; do
1534 if [[ ${opt} = "-o" ]] ; then 1722 if [[ ${opt} = "-o" ]] ; then
1535 has $1 ${USE_BUILT} && return 0 1723 has $1 ${USE_BUILT} && return 0
1550 local f 1738 local f
1551 for f in $(find ${dir} -name configure) ; do 1739 for f in $(find ${dir} -name configure) ; do
1552 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1740 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1553 done 1741 done
1554 eend 0 1742 eend 0
1555}
1556
1557# dopamd <file> [more files]
1558#
1559# Install pam auth config file in /etc/pam.d
1560dopamd() {
1561 [[ -z $1 ]] && die "dopamd requires at least one argument"
1562
1563 use pam || return 0
1564
1565 INSDESTTREE=/etc/pam.d \
1566 doins "$@" || die "failed to install $@"
1567}
1568# newpamd <old name> <new name>
1569#
1570# Install pam file <old name> as <new name> in /etc/pam.d
1571newpamd() {
1572 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1573
1574 use pam || return 0
1575
1576 INSDESTTREE=/etc/pam.d \
1577 newins "$1" "$2" || die "failed to install $1 as $2"
1578} 1743}
1579 1744
1580# make a wrapper script ... 1745# make a wrapper script ...
1581# NOTE: this was originally games_make_wrapper, but I noticed other places where 1746# NOTE: this was originally games_make_wrapper, but I noticed other places where
1582# this could be used, so I have moved it here and made it not games-specific 1747# this could be used, so I have moved it here and made it not games-specific
1587# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1752# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1588# $5 == path for wrapper 1753# $5 == path for wrapper
1589make_wrapper() { 1754make_wrapper() {
1590 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1755 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1591 local tmpwrapper=$(emktemp) 1756 local tmpwrapper=$(emktemp)
1757 # We don't want to quote ${bin} so that people can pass complex
1758 # things as $bin ... "./someprog --args"
1592 cat << EOF > "${tmpwrapper}" 1759 cat << EOF > "${tmpwrapper}"
1593#!/bin/sh 1760#!/bin/sh
1594cd "${chdir}" 1761cd "${chdir:-.}"
1762if [ -n "${libdir}" ] ; then
1763 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1595export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1764 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1765 else
1766 export LD_LIBRARY_PATH="${libdir}"
1767 fi
1768fi
1596exec ${bin} "\$@" 1769exec ${bin} "\$@"
1597EOF 1770EOF
1598 chmod go+rx "${tmpwrapper}" 1771 chmod go+rx "${tmpwrapper}"
1599 if [ -n "${5}" ] 1772 if [[ -n ${path} ]] ; then
1600 then
1601 exeinto ${5} 1773 exeinto "${path}"
1602 newexe "${tmpwrapper}" "${wrapper}" 1774 newexe "${tmpwrapper}" "${wrapper}"
1603 else 1775 else
1604 newbin "${tmpwrapper}" "${wrapper}" 1776 newbin "${tmpwrapper}" "${wrapper}"
1605 fi 1777 fi
1606} 1778}

Legend:
Removed from v.1.186  
changed lines
  Added in v.1.279

  ViewVC Help
Powered by ViewVC 1.1.20