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

Diff of /eclass/eutils.eclass

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

Revision 1.180 Revision 1.252
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.180 2005/06/03 21:58:01 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.252 2006/10/05 00:12:07 nyhm 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
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15
16DEPEND="!bootstrap? ( sys-devel/patch )"
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
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=""
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
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##*/}
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}" ] 453 if [[ -z ${euser} ]] ; then
455 then
456 eerror "No username specified !" 454 eerror "No username specified !"
457 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
458 fi 456 fi
459 457
460 # lets see if the username already exists 458 # lets see if the username already exists
461 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 459 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
462 then
463 return 0 460 return 0
464 fi 461 fi
465 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
466 463
467 # options to pass to useradd 464 # options to pass to useradd
468 local opts= 465 local opts=
469 466
470 # handle uid 467 # handle uid
471 local euid="$1"; shift 468 local euid=$1; shift
472 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 469 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
473 then
474 if [ "${euid}" -gt 0 ] 470 if [[ ${euid} -gt 0 ]] ; then
475 then
476 if [ ! -z "`egetent passwd ${euid}`" ] 471 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
477 then
478 euid="next" 472 euid="next"
479 fi 473 fi
480 else 474 else
481 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
482 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
483 fi 477 fi
484 else 478 else
485 euid="next" 479 euid="next"
486 fi 480 fi
487 if [ "${euid}" == "next" ] 481 if [[ ${euid} == "next" ]] ; then
488 then 482 for euid in $(seq 101 999) ; do
489 local pwrange
490 if [ "${USERLAND}" == "BSD" ] ; then
491 pwrange="`jot 898 101`"
492 else
493 pwrange="`seq 101 999`"
494 fi
495 for euid in ${pwrange} ; do
496 [ -z "`egetent passwd ${euid}`" ] && break 483 [[ -z $(egetent passwd ${euid}) ]] && break
497 done 484 done
498 fi 485 fi
499 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
500 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
501 488
502 # handle shell 489 # handle shell
503 local eshell="$1"; shift 490 local eshell=$1; shift
504 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
505 then 492 if [[ ! -e ${ROOT}${eshell} ]] ; then
506 if [ ! -e "${eshell}" ]
507 then
508 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
509 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"
510 fi 499 fi
511 else 500 else
512 if [[ "${USERLAND}" == "Darwin" ]]; then 501 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
513 eshell="/usr/bin/false" 502 [[ -x ${ROOT}${shell} ]] && break
514 elif [[ "${USERLAND}" == "BSD" ]]; then 503 done
515 eshell="/usr/sbin/nologin" 504
516 else 505 if [[ ${shell} == "/dev/null" ]] ; then
517 eshell="/bin/false" 506 eerror "Unable to identify the shell to use"
507 die "Unable to identify the shell to use"
518 fi 508 fi
509
510 eshell=${shell}
519 fi 511 fi
520 einfo " - Shell: ${eshell}" 512 einfo " - Shell: ${eshell}"
521 opts="${opts} -s ${eshell}" 513 opts="${opts} -s ${eshell}"
522 514
523 # handle homedir 515 # handle homedir
524 local ehome="$1"; shift 516 local ehome=$1; shift
525 if [ -z "${ehome}" ] || [ "${ehome}" == "-1" ] 517 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
526 then
527 ehome="/dev/null" 518 ehome="/dev/null"
528 fi 519 fi
529 einfo " - Home: ${ehome}" 520 einfo " - Home: ${ehome}"
530 opts="${opts} -d ${ehome}" 521 opts="${opts} -d ${ehome}"
531 522
532 # handle groups 523 # handle groups
533 local egroups="$1"; shift 524 local egroups=$1; shift
534 if [ ! -z "${egroups}" ] 525 if [[ ! -z ${egroups} ]] ; then
535 then
536 local oldifs="${IFS}" 526 local oldifs=${IFS}
537 local defgroup="" exgroups="" 527 local defgroup="" exgroups=""
538 528
539 export IFS="," 529 export IFS=","
540 for g in ${egroups} 530 for g in ${egroups} ; do
541 do
542 export IFS="${oldifs}" 531 export IFS=${oldifs}
543 if [ -z "`egetent group \"${g}\"`" ] 532 if [[ -z $(egetent group "${g}") ]] ; then
544 then
545 eerror "You must add group ${g} to the system first" 533 eerror "You must add group ${g} to the system first"
546 die "${g} is not a valid GID" 534 die "${g} is not a valid GID"
547 fi 535 fi
548 if [ -z "${defgroup}" ] 536 if [[ -z ${defgroup} ]] ; then
549 then
550 defgroup="${g}" 537 defgroup=${g}
551 else 538 else
552 exgroups="${exgroups},${g}" 539 exgroups="${exgroups},${g}"
553 fi 540 fi
554 export IFS="," 541 export IFS=","
555 done 542 done
556 export IFS="${oldifs}" 543 export IFS=${oldifs}
557 544
558 opts="${opts} -g ${defgroup}" 545 opts="${opts} -g ${defgroup}"
559 if [ ! -z "${exgroups}" ] 546 if [[ ! -z ${exgroups} ]] ; then
560 then
561 opts="${opts} -G ${exgroups:1}" 547 opts="${opts} -G ${exgroups:1}"
562 fi 548 fi
563 else 549 else
564 egroups="(none)" 550 egroups="(none)"
565 fi 551 fi
566 einfo " - Groups: ${egroups}" 552 einfo " - Groups: ${egroups}"
567 553
568 # handle extra and add the user 554 # handle extra and add the user
569 local eextra="$@"
570 local oldsandbox="${SANDBOX_ON}" 555 local oldsandbox=${SANDBOX_ON}
571 export SANDBOX_ON="0" 556 export SANDBOX_ON="0"
572 if [[ "${USERLAND}" == "Darwin" ]] 557 case ${CHOST} in
573 then 558 *-darwin*)
574 ### Make the user 559 ### Make the user
575 if [ -z "${eextra}" ] 560 if [[ -z $@ ]] ; then
576 then
577 dscl . create /users/${euser} uid ${euid} 561 dscl . create /users/${euser} uid ${euid}
578 dscl . create /users/${euser} shell ${eshell} 562 dscl . create /users/${euser} shell ${eshell}
579 dscl . create /users/${euser} home ${ehome} 563 dscl . create /users/${euser} home ${ehome}
580 dscl . create /users/${euser} realname "added by portage for ${PN}" 564 dscl . create /users/${euser} realname "added by portage for ${PN}"
581 ### Add the user to the groups specified 565 ### Add the user to the groups specified
582 local oldifs="${IFS}" 566 local oldifs=${IFS}
583 export IFS="," 567 export IFS=","
584 for g in ${egroups} 568 for g in ${egroups} ; do
585 do
586 dscl . merge /groups/${g} users ${euser} 569 dscl . merge /groups/${g} users ${euser}
587 done 570 done
588 export IFS="${oldifs}" 571 export IFS=${oldifs}
589 else 572 else
590 einfo "Extra options are not supported on macos yet" 573 einfo "Extra options are not supported on Darwin yet"
591 einfo "Please report the ebuild along with the info below" 574 einfo "Please report the ebuild along with the info below"
592 einfo "eextra: ${eextra}" 575 einfo "eextra: $@"
593 die "Required function missing" 576 die "Required function missing"
594 fi 577 fi
595 elif [[ "${USERLAND}" == "BSD" ]] ; then 578 ;;
596 if [ -z "${eextra}" ] 579 *-freebsd*|*-dragonfly*)
597 then 580 if [[ -z $@ ]] ; then
598 pw useradd ${euser} ${opts} \ 581 pw useradd ${euser} ${opts} \
599 -c "added by portage for ${PN}" \ 582 -c "added by portage for ${PN}" \
600 die "enewuser failed" 583 die "enewuser failed"
601 else 584 else
602 einfo " - Extra: ${eextra}" 585 einfo " - Extra: $@"
603 pw useradd ${euser} ${opts} \ 586 pw useradd ${euser} ${opts} \
604 -c ${eextra} || die "enewuser failed" 587 "$@" || die "enewuser failed"
605 fi 588 fi
589 ;;
590
591 *-netbsd*)
592 if [[ -z $@ ]] ; then
593 useradd ${opts} ${euser} || die "enewuser failed"
606 else 594 else
607 if [ -z "${eextra}" ] 595 einfo " - Extra: $@"
608 then 596 useradd ${opts} ${euser} "$@" || die "enewuser failed"
597 fi
598 ;;
599
600 *-openbsd*)
601 if [[ -z $@ ]] ; then
602 useradd -u ${euid} -s ${eshell} \
603 -d ${ehome} -c "Added by portage for ${PN}" \
604 -g ${egroups} ${euser} || die "enewuser failed"
605 else
606 einfo " - Extra: $@"
607 useradd -u ${euid} -s ${eshell} \
608 -d ${ehome} -c "Added by portage for ${PN}" \
609 -g ${egroups} ${euser} "$@" || die "enewuser failed"
610 fi
611 ;;
612
613 *)
614 if [[ -z $@ ]] ; then
609 useradd ${opts} ${euser} \ 615 useradd ${opts} ${euser} \
610 -c "added by portage for ${PN}" \ 616 -c "added by portage for ${PN}" \
611 || die "enewuser failed" 617 || die "enewuser failed"
612 else 618 else
613 einfo " - Extra: ${eextra}" 619 einfo " - Extra: $@"
614 useradd ${opts} ${euser} ${eextra} \ 620 useradd ${opts} ${euser} "$@" \
615 || die "enewuser failed" 621 || die "enewuser failed"
616 fi 622 fi
623 ;;
624 esac
625
626 if [[ ! -e ${ROOT}/${ehome} ]] ; then
627 einfo " - Creating ${ehome} in ${ROOT}"
628 mkdir -p "${ROOT}/${ehome}"
629 chown ${euser} "${ROOT}/${ehome}"
630 chmod 755 "${ROOT}/${ehome}"
617 fi 631 fi
632
618 export SANDBOX_ON="${oldsandbox}" 633 export SANDBOX_ON=${oldsandbox}
619
620 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
621 then
622 einfo " - Creating ${ehome} in ${D}"
623 dodir ${ehome}
624 fowners ${euser} ${ehome}
625 fperms 755 ${ehome}
626 fi
627} 634}
628 635
629# Simplify/standardize adding groups to the system 636# Simplify/standardize adding groups to the system
630# vapier@gentoo.org 637# vapier@gentoo.org
631# 638#
634# Default values if you do not specify any: 641# Default values if you do not specify any:
635# groupname: REQUIRED ! 642# groupname: REQUIRED !
636# gid: next available (see groupadd(8)) 643# gid: next available (see groupadd(8))
637# extra: none 644# extra: none
638enewgroup() { 645enewgroup() {
646 case ${EBUILD_PHASE} in
647 unpack|compile|test|install)
648 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
649 eerror "Package fails at QA and at life. Please file a bug."
650 die "Bad package! enewgroup is only for use in pkg_* functions!"
651 esac
652
639 # get the group 653 # get the group
640 local egroup="$1"; shift 654 local egroup="$1"; shift
641 if [ -z "${egroup}" ] 655 if [ -z "${egroup}" ]
642 then 656 then
643 eerror "No group specified !" 657 eerror "No group specified !"
660 then 674 then
661 if [ "${egid}" -gt 0 ] 675 if [ "${egid}" -gt 0 ]
662 then 676 then
663 if [ -z "`egetent group ${egid}`" ] 677 if [ -z "`egetent group ${egid}`" ]
664 then 678 then
665 if [[ "${USERLAND}" == "Darwin" ]]; then 679 if [[ "${CHOST}" == *-darwin* ]]; then
666 opts="${opts} ${egid}" 680 opts="${opts} ${egid}"
667 else 681 else
668 opts="${opts} -g ${egid}" 682 opts="${opts} -g ${egid}"
669 fi 683 fi
670 else 684 else
684 opts="${opts} ${eextra}" 698 opts="${opts} ${eextra}"
685 699
686 # add the group 700 # add the group
687 local oldsandbox="${SANDBOX_ON}" 701 local oldsandbox="${SANDBOX_ON}"
688 export SANDBOX_ON="0" 702 export SANDBOX_ON="0"
689 if [[ "${USERLAND}" == "Darwin" ]]; then 703 case ${CHOST} in
704 *-darwin*)
690 if [ ! -z "${eextra}" ]; 705 if [ ! -z "${eextra}" ];
691 then 706 then
692 einfo "Extra options are not supported on Darwin/OS X yet" 707 einfo "Extra options are not supported on Darwin/OS X yet"
693 einfo "Please report the ebuild along with the info below" 708 einfo "Please report the ebuild along with the info below"
694 einfo "eextra: ${eextra}" 709 einfo "eextra: ${eextra}"
695 die "Required function missing" 710 die "Required function missing"
696 fi 711 fi
697 712
698 # If we need the next available 713 # If we need the next available
699 case ${egid} in 714 case ${egid} in
700 *[!0-9]*) # Non numeric 715 *[!0-9]*) # Non numeric
701 for egid in `jot 898 101`; do 716 for egid in $(seq 101 999); do
702 [ -z "`egetent group ${egid}`" ] && break 717 [ -z "`egetent group ${egid}`" ] && break
703 done 718 done
704 esac 719 esac
705 dscl . create /groups/${egroup} gid ${egid} 720 dscl . create /groups/${egroup} gid ${egid}
706 dscl . create /groups/${egroup} passwd '*' 721 dscl . create /groups/${egroup} passwd '*'
707 elif [[ "${USERLAND}" == "BSD" ]] ; then 722 ;;
723
724 *-freebsd*|*-dragonfly*)
708 case ${egid} in 725 case ${egid} in
709 *[!0-9]*) # Non numeric 726 *[!0-9]*) # Non numeric
710 for egid in `jot 898 101`; do 727 for egid in $(seq 101 999); do
711 [ -z "`egetent group ${egid}`" ] && break 728 [ -z "`egetent group ${egid}`" ] && break
712 done 729 done
713 esac 730 esac
714 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 731 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
715 else 732 ;;
733
734 *-netbsd*)
735 case ${egid} in
736 *[!0-9]*) # Non numeric
737 for egid in $(seq 101 999); do
738 [ -z "`egetent group ${egid}`" ] && break
739 done
740 esac
741 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
742 ;;
743
744 *)
716 groupadd ${opts} ${egroup} || die "enewgroup failed" 745 groupadd ${opts} ${egroup} || die "enewgroup failed"
717 fi 746 ;;
747 esac
718 export SANDBOX_ON="${oldsandbox}" 748 export SANDBOX_ON="${oldsandbox}"
719} 749}
720 750
721# Simple script to replace 'dos2unix' binaries 751# Simple script to replace 'dos2unix' binaries
722# vapier@gentoo.org 752# vapier@gentoo.org
739 769
740# Make a desktop file ! 770# Make a desktop file !
741# Great for making those icons in kde/gnome startmenu ! 771# Great for making those icons in kde/gnome startmenu !
742# Amaze your friends ! Get the women ! Join today ! 772# Amaze your friends ! Get the women ! Join today !
743# 773#
744# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 774# make_desktop_entry(<command>, [name], [icon], [type], [path])
745# 775#
746# binary: what binary does the app run with ? 776# binary: what command does the app run with ?
747# name: the name that will show up in the menu 777# name: the name that will show up in the menu
748# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
749# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
750# a full path to an icon 780# a full path to an icon
751# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
752# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 782# http://www.freedesktop.org/Standards/desktop-entry-spec
753# path: if your app needs to startup in a specific dir 783# path: if your app needs to startup in a specific dir
754make_desktop_entry() { 784make_desktop_entry() {
755 [[ -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
756 786
757 local exec=${1} 787 local exec=${1}
783 dev) 813 dev)
784 type="Development" 814 type="Development"
785 ;; 815 ;;
786 816
787 games) 817 games)
788 [[ -z ${path} ]] && path=${GAMES_BINDIR}
789
790 case ${catmin} in 818 case ${catmin} in
791 action) type=ActionGame;; 819 action) type=ActionGame;;
792 arcade) type=ArcadeGame;; 820 arcade) type=ArcadeGame;;
793 board) type=BoardGame;; 821 board) type=BoardGame;;
794 kid) type=KidsGame;; 822 kids) type=KidsGame;;
795 emulation) type=Emulator;; 823 emulation) type=Emulator;;
796 puzzle) type=LogicGame;; 824 puzzle) type=LogicGame;;
797 rpg) type=RolePlaying;; 825 rpg) type=RolePlaying;;
798 roguelike) type=RolePlaying;; 826 roguelike) type=RolePlaying;;
799 simulation) type=Simulation;; 827 simulation) type=Simulation;;
835 type="Network;${type}" 863 type="Network;${type}"
836 ;; 864 ;;
837 865
838 sci) 866 sci)
839 case ${catmin} in 867 case ${catmin} in
840 astro*) type=Astronomoy;; 868 astro*) type=Astronomy;;
841 bio*) type=Biology;; 869 bio*) type=Biology;;
842 calc*) type=Calculator;; 870 calc*) type=Calculator;;
843 chem*) type=Chemistry;; 871 chem*) type=Chemistry;;
844 geo*) type=Geology;; 872 geo*) type=Geology;;
845 math*) type=Math;; 873 math*) type=Math;;
865 local desktop_name="${PN}" 893 local desktop_name="${PN}"
866 else 894 else
867 local desktop_name="${PN}-${SLOT}" 895 local desktop_name="${PN}-${SLOT}"
868 fi 896 fi
869 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 897 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
898# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
870 899
871echo "[Desktop Entry] 900echo "[Desktop Entry]
872Encoding=UTF-8 901Encoding=UTF-8
873Version=0.9.2 902Version=0.9.2
874Name=${name} 903Name=${name}
875Type=Application 904Type=Application
876Comment=${DESCRIPTION} 905Comment=${DESCRIPTION}
877Exec=${exec} 906Exec=${exec}
907TryExec=${exec%% *}
878Path=${path} 908Path=${path}
879Icon=${icon} 909Icon=${icon}
880Categories=Application;${type};" > "${desktop}" 910Categories=Application;${type};" > "${desktop}"
881 911
912 (
913 # wrap the env here so that the 'insinto' call
914 # doesn't corrupt the env of the caller
882 insinto /usr/share/applications 915 insinto /usr/share/applications
883 doins "${desktop}" 916 doins "${desktop}"
884 917 )
885 return 0
886} 918}
887 919
888# Make a GDM/KDM Session file 920# Make a GDM/KDM Session file
889# 921#
890# make_desktop_entry(<title>, <command>) 922# make_desktop_entry(<title>, <command>)
919 doins "${i}" 951 doins "${i}"
920 elif [[ -d ${i} ]] ; then 952 elif [[ -d ${i} ]] ; then
921 for j in "${i}"/*.desktop ; do 953 for j in "${i}"/*.desktop ; do
922 doins "${j}" 954 doins "${j}"
923 done 955 done
924 fi 956 fi
925 done 957 done
926} 958}
927newmenu() { 959newmenu() {
928 insinto /usr/share/applications 960 insinto /usr/share/applications
929 newins "$1" "$2" 961 newins "$1" "$2"
937 doins "${i}" 969 doins "${i}"
938 elif [[ -d ${i} ]] ; then 970 elif [[ -d ${i} ]] ; then
939 for j in "${i}"/*.png ; do 971 for j in "${i}"/*.png ; do
940 doins "${j}" 972 doins "${j}"
941 done 973 done
942 fi 974 fi
943 done 975 done
944} 976}
945newicon() { 977newicon() {
946 insinto /usr/share/pixmaps 978 insinto /usr/share/pixmaps
947 newins "$1" "$2" 979 newins "$1" "$2"
952############################################################## 984##############################################################
953 985
954 986
955# for internal use only (unpack_pdv and unpack_makeself) 987# for internal use only (unpack_pdv and unpack_makeself)
956find_unpackable_file() { 988find_unpackable_file() {
957 local src="$1" 989 local src=$1
958 if [ -z "${src}" ] 990 if [[ -z ${src} ]] ; then
959 then
960 src="${DISTDIR}/${A}" 991 src=${DISTDIR}/${A}
961 else 992 else
962 if [ -e "${DISTDIR}/${src}" ] 993 if [[ -e ${DISTDIR}/${src} ]] ; then
963 then
964 src="${DISTDIR}/${src}" 994 src=${DISTDIR}/${src}
965 elif [ -e "${PWD}/${src}" ] 995 elif [[ -e ${PWD}/${src} ]] ; then
966 then
967 src="${PWD}/${src}" 996 src=${PWD}/${src}
968 elif [ -e "${src}" ] 997 elif [[ -e ${src} ]] ; then
969 then
970 src="${src}" 998 src=${src}
971 fi
972 fi 999 fi
973 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 1000 fi
1001 [[ ! -e ${src} ]] && return 1
974 echo "${src}" 1002 echo "${src}"
975} 1003}
976 1004
977# Unpack those pesky pdv generated files ... 1005# Unpack those pesky pdv generated files ...
978# They're self-unpacking programs with the binary package stuffed in 1006# They're self-unpacking programs with the binary package stuffed in
993# lseek 1021# lseek
994# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1022# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
995# lseek(3, -4, SEEK_END) = 2981250 1023# lseek(3, -4, SEEK_END) = 2981250
996# thus we would pass in the value of '4' as the second parameter. 1024# thus we would pass in the value of '4' as the second parameter.
997unpack_pdv() { 1025unpack_pdv() {
998 local src="`find_unpackable_file $1`" 1026 local src=$(find_unpackable_file $1)
999 local sizeoff_t="$2" 1027 local sizeoff_t=$2
1000 1028
1029 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1001 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1030 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1002 1031
1003 local shrtsrc="`basename ${src}`" 1032 local shrtsrc=$(basename "${src}")
1004 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1033 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1005 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1034 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1006 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1035 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1007 1036
1008 # grab metadata for debug reasons 1037 # grab metadata for debug reasons
1072# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1101# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1073# - If the file is not specified then unpack will utilize ${A}. 1102# - If the file is not specified then unpack will utilize ${A}.
1074# - If the offset is not specified then we will attempt to extract 1103# - If the offset is not specified then we will attempt to extract
1075# the proper offset from the script itself. 1104# the proper offset from the script itself.
1076unpack_makeself() { 1105unpack_makeself() {
1106 local src_input=${1:-${A}}
1077 local src="$(find_unpackable_file "$1")" 1107 local src=$(find_unpackable_file "${src_input}")
1078 local skip="$2" 1108 local skip=$2
1079 local exe="$3" 1109 local exe=$3
1080 1110
1111 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1112
1081 local shrtsrc="$(basename "${src}")" 1113 local shrtsrc=$(basename "${src}")
1082 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1114 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1083 if [ -z "${skip}" ] 1115 if [[ -z ${skip} ]] ; then
1084 then
1085 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1116 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1086 local skip=0 1117 local skip=0
1087 exe=tail 1118 exe=tail
1088 case ${ver} in 1119 case ${ver} in
1089 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1120 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1090 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1121 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1091 ;; 1122 ;;
1092 2.0|2.0.1) 1123 2.0|2.0.1)
1093 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1124 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1094 ;; 1125 ;;
1102 ;; 1133 ;;
1103 2.1.3) 1134 2.1.3)
1104 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1135 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1105 let skip="skip + 1" 1136 let skip="skip + 1"
1106 ;; 1137 ;;
1107 2.1.4) 1138 2.1.4|2.1.5)
1108 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1139 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1109 skip=$(head -n ${skip} "${src}" | wc -c) 1140 skip=$(head -n ${skip} "${src}" | wc -c)
1110 exe="dd" 1141 exe="dd"
1111 ;; 1142 ;;
1112 *) 1143 *)
1157check_license() { 1188check_license() {
1158 local lic=$1 1189 local lic=$1
1159 if [ -z "${lic}" ] ; then 1190 if [ -z "${lic}" ] ; then
1160 lic="${PORTDIR}/licenses/${LICENSE}" 1191 lic="${PORTDIR}/licenses/${LICENSE}"
1161 else 1192 else
1162 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1193 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1163 lic="${PORTDIR}/licenses/${src}" 1194 lic="${PORTDIR}/licenses/${lic}"
1164 elif [ -e "${PWD}/${src}" ] ; then 1195 elif [ -e "${PWD}/${lic}" ] ; then
1165 lic="${PWD}/${src}" 1196 lic="${PWD}/${lic}"
1166 elif [ -e "${src}" ] ; then 1197 elif [ -e "${lic}" ] ; then
1167 lic="${src}" 1198 lic="${lic}"
1168 fi
1169 fi 1199 fi
1200 fi
1170 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1201 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1171 local l="`basename ${lic}`" 1202 local l="`basename ${lic}`"
1172 1203
1173 # here is where we check for the licenses the user already 1204 # here is where we check for the licenses the user already
1174 # accepted ... if we don't find a match, we make the user accept 1205 # accepted ... if we don't find a match, we make the user accept
1175 local shopts=$- 1206 local shopts=$-
1217# and when the function returns, you can assume that the cd has been 1248# and when the function returns, you can assume that the cd has been
1218# found at CDROM_ROOT. 1249# found at CDROM_ROOT.
1219# 1250#
1220# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1251# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1221# etc... if you want to give the cds better names, then just export 1252# etc... if you want to give the cds better names, then just export
1222# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1253# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1254# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1255# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1256# CDROM_NAME_2="data cd"
1257# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1223# 1258#
1224# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1259# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1225# 1260#
1226# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1261# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1227# - this will attempt to locate a cd based upon a file that is on 1262# - this will attempt to locate a cd based upon a file that is on
1231 # first we figure out how many cds we're dealing with by 1266 # first we figure out how many cds we're dealing with by
1232 # the # of files they gave us 1267 # the # of files they gave us
1233 local cdcnt=0 1268 local cdcnt=0
1234 local f= 1269 local f=
1235 for f in "$@" ; do 1270 for f in "$@" ; do
1236 cdcnt=$((cdcnt + 1)) 1271 ((++cdcnt))
1237 export CDROM_CHECK_${cdcnt}="$f" 1272 export CDROM_CHECK_${cdcnt}="$f"
1238 done 1273 done
1239 export CDROM_TOTAL_CDS=${cdcnt} 1274 export CDROM_TOTAL_CDS=${cdcnt}
1240 export CDROM_CURRENT_CD=1 1275 export CDROM_CURRENT_CD=1
1241 1276
1242 # now we see if the user gave use CD_ROOT ... 1277 # now we see if the user gave use CD_ROOT ...
1243 # if they did, let's just believe them that it's correct 1278 # if they did, let's just believe them that it's correct
1244 if [[ ! -z ${CD_ROOT} ]] ; then
1245 export CDROM_ROOT=${CD_ROOT}
1246 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1247 return
1248 fi
1249 # do the same for CD_ROOT_X
1250 if [[ ! -z ${CD_ROOT_1} ]] ; then 1279 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1251 local var= 1280 local var=
1252 cdcnt=0 1281 cdcnt=0
1253 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1282 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1254 cdcnt=$((cdcnt + 1)) 1283 ((++cdcnt))
1255 var="CD_ROOT_${cdcnt}" 1284 var="CD_ROOT_${cdcnt}"
1285 [[ -z ${!var} ]] && var="CD_ROOT"
1256 if [[ -z ${!var} ]] ; then 1286 if [[ -z ${!var} ]] ; then
1257 eerror "You must either use just the CD_ROOT" 1287 eerror "You must either use just the CD_ROOT"
1258 eerror "or specify ALL the CD_ROOT_X variables." 1288 eerror "or specify ALL the CD_ROOT_X variables."
1259 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1289 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1260 die "could not locate CD_ROOT_${cdcnt}" 1290 die "could not locate CD_ROOT_${cdcnt}"
1261 fi 1291 fi
1262 export CDROM_ROOTS_${cdcnt}="${!var}"
1263 done 1292 done
1264 export CDROM_ROOT=${CDROM_ROOTS_1} 1293 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1265 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1294 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1295 export CDROM_SET=-1
1296 for f in ${CDROM_CHECK_1//:/ } ; do
1297 ((++CDROM_SET))
1298 [[ -e ${CD_ROOT}/${f} ]] && break
1299 done
1300 export CDROM_MATCH=${f}
1266 return 1301 return
1267 fi 1302 fi
1268 1303
1304 # User didn't help us out so lets make sure they know they can
1305 # simplify the whole process ...
1269 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1306 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1270 einfon "This ebuild will need the " 1307 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1271 if [[ -z ${CDROM_NAME} ]] ; then
1272 echo "cdrom for ${PN}."
1273 else
1274 echo "${CDROM_NAME}."
1275 fi
1276 echo 1308 echo
1277 einfo "If you do not have the CD, but have the data files" 1309 einfo "If you do not have the CD, but have the data files"
1278 einfo "mounted somewhere on your filesystem, just export" 1310 einfo "mounted somewhere on your filesystem, just export"
1279 einfo "the variable CD_ROOT so that it points to the" 1311 einfo "the variable CD_ROOT so that it points to the"
1280 einfo "directory containing the files." 1312 einfo "directory containing the files."
1281 echo 1313 echo
1282 einfo "For example:" 1314 einfo "For example:"
1283 einfo "export CD_ROOT=/mnt/cdrom" 1315 einfo "export CD_ROOT=/mnt/cdrom"
1284 echo 1316 echo
1285 else 1317 else
1318 if [[ -n ${CDROM_NAME_SET} ]] ; then
1319 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1320 cdcnt=0
1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1322 ((++cdcnt))
1323 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1324 done
1325 fi
1326
1286 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1327 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1287 cdcnt=0 1328 cdcnt=0
1288 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1329 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1289 cdcnt=$((cdcnt + 1)) 1330 ((++cdcnt))
1290 var="CDROM_NAME_${cdcnt}" 1331 var="CDROM_NAME_${cdcnt}"
1291 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1332 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1292 done 1333 done
1293 echo 1334 echo
1294 einfo "If you do not have the CDs, but have the data files" 1335 einfo "If you do not have the CDs, but have the data files"
1295 einfo "mounted somewhere on your filesystem, just export" 1336 einfo "mounted somewhere on your filesystem, just export"
1296 einfo "the following variables so they point to the right place:" 1337 einfo "the following variables so they point to the right place:"
1297 einfon "" 1338 einfon ""
1298 cdcnt=0 1339 cdcnt=0
1299 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1340 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1300 cdcnt=$((cdcnt + 1)) 1341 ((++cdcnt))
1301 echo -n " CD_ROOT_${cdcnt}" 1342 echo -n " CD_ROOT_${cdcnt}"
1302 done 1343 done
1303 echo 1344 echo
1304 einfo "Or, if you have all the files in the same place, or" 1345 einfo "Or, if you have all the files in the same place, or"
1305 einfo "you only have one cdrom, you can export CD_ROOT" 1346 einfo "you only have one cdrom, you can export CD_ROOT"
1308 echo 1349 echo
1309 einfo "For example:" 1350 einfo "For example:"
1310 einfo "export CD_ROOT_1=/mnt/cdrom" 1351 einfo "export CD_ROOT_1=/mnt/cdrom"
1311 echo 1352 echo
1312 fi 1353 fi
1354
1355 export CDROM_SET=""
1313 export CDROM_CURRENT_CD=0 1356 export CDROM_CURRENT_CD=0
1314 cdrom_load_next_cd 1357 cdrom_load_next_cd
1315} 1358}
1316 1359
1317# this is only used when you need access to more than one cd. 1360# this is only used when you need access to more than one cd.
1318# when you have finished using the first cd, just call this function. 1361# when you have finished using the first cd, just call this function.
1319# when it returns, CDROM_ROOT will be pointing to the second cd. 1362# when it returns, CDROM_ROOT will be pointing to the second cd.
1320# remember, you can only go forward in the cd chain, you can't go back. 1363# remember, you can only go forward in the cd chain, you can't go back.
1321cdrom_load_next_cd() { 1364cdrom_load_next_cd() {
1322 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1323 local var= 1365 local var
1324 1366 ((++CDROM_CURRENT_CD))
1325 if [[ ! -z ${CD_ROOT} ]] ; then
1326 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1327 return
1328 fi
1329 1367
1330 unset CDROM_ROOT 1368 unset CDROM_ROOT
1331 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1369 var=CD_ROOT_${CDROM_CURRENT_CD}
1370 [[ -z ${!var} ]] && var="CD_ROOT"
1332 if [[ -z ${!var} ]] ; then 1371 if [[ -z ${!var} ]] ; then
1333 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1372 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1334 cdrom_locate_file_on_cd ${!var} 1373 _cdrom_locate_file_on_cd ${!var}
1335 else 1374 else
1336 export CDROM_ROOT=${!var} 1375 export CDROM_ROOT=${!var}
1337 fi 1376 fi
1338 1377
1339 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1378 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1344# all it does is try to locate a give file on a cd ... if the cd isn't 1383# all it does is try to locate a give file on a cd ... if the cd isn't
1345# found, then a message asking for the user to insert the cdrom will be 1384# found, then a message asking for the user to insert the cdrom will be
1346# displayed and we'll hang out here until: 1385# displayed and we'll hang out here until:
1347# (1) the file is found on a mounted cdrom 1386# (1) the file is found on a mounted cdrom
1348# (2) the user hits CTRL+C 1387# (2) the user hits CTRL+C
1349cdrom_locate_file_on_cd() { 1388_cdrom_locate_file_on_cd() {
1389 local mline=""
1390 local showedmsg=0
1391
1350 while [[ -z ${CDROM_ROOT} ]] ; do 1392 while [[ -z ${CDROM_ROOT} ]] ; do
1393 local i=0
1394 local -a cdset=(${*//:/ })
1395 if [[ -n ${CDROM_SET} ]] ; then
1396 cdset=(${cdset[${CDROM_SET}]})
1397 fi
1398
1399 while [[ -n ${cdset[${i}]} ]] ; do
1351 local dir="$(dirname ${@})" 1400 local dir=$(dirname ${cdset[${i}]})
1352 local file="$(basename ${@})" 1401 local file=$(basename ${cdset[${i}]})
1353 local mline=""
1354 local showedmsg=0
1355 1402
1356 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1403 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1357 [[ -d ${mline}/${dir} ]] || continue 1404 [[ -d ${mline}/${dir} ]] || continue
1358 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1405 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1359 && export CDROM_ROOT=${mline} 1406 export CDROM_ROOT=${mline}
1407 export CDROM_SET=${i}
1408 export CDROM_MATCH=${cdset[${i}]}
1409 return
1410 fi
1411 done
1412
1413 ((++i))
1360 done 1414 done
1361 1415
1362 if [[ -z ${CDROM_ROOT} ]] ; then
1363 echo 1416 echo
1364 if [[ ${showedmsg} -eq 0 ]] ; then 1417 if [[ ${showedmsg} -eq 0 ]] ; then
1365 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1418 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1366 if [[ -z ${CDROM_NAME} ]] ; then 1419 if [[ -z ${CDROM_NAME} ]] ; then
1367 einfo "Please insert the cdrom for ${PN} now !" 1420 einfo "Please insert+mount the cdrom for ${PN} now !"
1368 else
1369 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1370 fi
1371 else 1421 else
1372 if [[ -z ${CDROM_NAME_1} ]] ; then
1373 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1374 else
1375 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1376 einfo "Please insert+mount the ${!var} cdrom now !" 1422 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1377 fi
1378 fi 1423 fi
1379 showedmsg=1 1424 else
1425 if [[ -z ${CDROM_NAME_1} ]] ; then
1426 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1427 else
1428 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1429 einfo "Please insert+mount the ${!var} cdrom now !"
1430 fi
1380 fi 1431 fi
1432 showedmsg=1
1433 fi
1381 einfo "Press return to scan for the cd again" 1434 einfo "Press return to scan for the cd again"
1382 einfo "or hit CTRL+C to abort the emerge." 1435 einfo "or hit CTRL+C to abort the emerge."
1383 read 1436 echo
1384 fi 1437 einfo "If you are having trouble with the detection"
1438 einfo "of your CD, it is possible that you do not have"
1439 einfo "Joliet support enabled in your kernel. Please"
1440 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1441 read || die "something is screwed with your system"
1385 done 1442 done
1386} 1443}
1387 1444
1388# Make sure that LINGUAS only contains languages that 1445# Make sure that LINGUAS only contains languages that
1389# a package can support 1446# a package can support
1396# The -i builds a list of po files found in all the 1453# The -i builds a list of po files found in all the
1397# directories and uses the intersection of the lists. 1454# directories and uses the intersection of the lists.
1398# The -u builds a list of po files found in all the 1455# The -u builds a list of po files found in all the
1399# directories and uses the union of the lists. 1456# directories and uses the union of the lists.
1400strip-linguas() { 1457strip-linguas() {
1401 local ls newls 1458 local ls newls nols
1402 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1459 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1403 local op=$1; shift 1460 local op=$1; shift
1404 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1461 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1405 local d f 1462 local d f
1406 for d in "$@" ; do 1463 for d in "$@" ; do
1407 if [[ ${op} == "-u" ]] ; then 1464 if [[ ${op} == "-u" ]] ; then
1408 newls=${ls} 1465 newls=${ls}
1409 else 1466 else
1410 newls="" 1467 newls=""
1411 fi 1468 fi
1412 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1469 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1413 if [[ ${op} == "-i" ]] ; then 1470 if [[ ${op} == "-i" ]] ; then
1414 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1471 hasq ${f} ${ls} && newls="${newls} ${f}"
1415 else 1472 else
1416 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1473 hasq ${f} ${ls} || newls="${newls} ${f}"
1417 fi 1474 fi
1418 done 1475 done
1419 ls=${newls} 1476 ls=${newls}
1420 done 1477 done
1421 ls=${ls//.po}
1422 else 1478 else
1423 ls=$@ 1479 ls="$@"
1424 fi 1480 fi
1425 1481
1426 ls=" ${ls} " 1482 nols=""
1427 newls="" 1483 newls=""
1428 for f in ${LINGUAS} ; do 1484 for f in ${LINGUAS} ; do
1429 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1485 if hasq ${f} ${ls} ; then
1430 newls="${newls} ${f}" 1486 newls="${newls} ${f}"
1431 else 1487 else
1432 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1488 nols="${nols} ${f}"
1433 fi 1489 fi
1434 done 1490 done
1435 if [[ -z ${newls} ]] ; then 1491 [[ -n ${nols} ]] \
1436 export LINGUAS="" 1492 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1437 else
1438 export LINGUAS=${newls:1} 1493 export LINGUAS=${newls:1}
1439 fi
1440} 1494}
1441 1495
1442# moved from kernel.eclass since they are generally useful outside of 1496# moved from kernel.eclass since they are generally useful outside of
1443# kernel.eclass -iggy (20041002) 1497# kernel.eclass -iggy (20041002)
1444 1498
1473 1527
1474# Jeremy Huddleston <eradicator@gentoo.org>: 1528# Jeremy Huddleston <eradicator@gentoo.org>:
1475# preserve_old_lib /path/to/libblah.so.0 1529# preserve_old_lib /path/to/libblah.so.0
1476# preserve_old_lib_notify /path/to/libblah.so.0 1530# preserve_old_lib_notify /path/to/libblah.so.0
1477# 1531#
1478# These functions are useful when a lib in your package changes --soname. Such 1532# These functions are useful when a lib in your package changes --library. Such
1479# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1533# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1480# would break packages that link against it. Most people get around this 1534# would break packages that link against it. Most people get around this
1481# by using the portage SLOT mechanism, but that is not always a relevant 1535# by using the portage SLOT mechanism, but that is not always a relevant
1482# solution, so instead you can add the following to your ebuilds: 1536# solution, so instead you can add the following to your ebuilds:
1483# 1537#
1510 LIB=$1 1564 LIB=$1
1511 1565
1512 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1566 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1513 SONAME=`basename ${LIB}` 1567 SONAME=`basename ${LIB}`
1514 1568
1515 einfo "An old version of an installed library was detected on your system." 1569 ewarn "An old version of an installed library was detected on your system."
1516 einfo "In order to avoid breaking packages that link against is, this older version" 1570 ewarn "In order to avoid breaking packages that link against it, this older version"
1517 einfo "is not being removed. In order to make full use of this newer version," 1571 ewarn "is not being removed. In order to make full use of this newer version,"
1518 einfo "you will need to execute the following command:" 1572 ewarn "you will need to execute the following command:"
1519 einfo " revdep-rebuild --soname ${SONAME}" 1573 ewarn " revdep-rebuild --library ${SONAME}"
1520 einfo 1574 ewarn
1521 einfo "After doing that, you can safely remove ${LIB}" 1575 ewarn "After doing that, you can safely remove ${LIB}"
1522 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1576 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1523 fi 1577 fi
1524} 1578}
1525 1579
1526# Hack for people to figure out if a package was built with 1580# Hack for people to figure out if a package was built with
1527# certain USE flags 1581# certain USE flags
1535built_with_use() { 1589built_with_use() {
1536 local opt=$1 1590 local opt=$1
1537 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1591 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1538 1592
1539 local PKG=$(best_version $1) 1593 local PKG=$(best_version $1)
1594 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1540 shift 1595 shift
1541 1596
1542 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1597 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1543 [[ ! -e ${USEFILE} ]] && return 1 1598 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1599
1600 # if the USE file doesnt exist, assume the $PKG is either
1601 # injected or package.provided
1602 [[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with"
1603
1604 local IUSE_BUILT=$(<${IUSEFILE})
1605 # Don't check USE_EXPAND #147237
1606 local expand
1607 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1608 if [[ $1 == ${expand}_* ]] ; then
1609 expand=""
1610 break
1611 fi
1612 done
1613 if [[ -n ${expand} ]] ; then
1614 has $1 ${IUSE_BUILT} || die "$PKG does not actually support the $1 USE flag!"
1615 fi
1544 1616
1545 local USE_BUILT=$(<${USEFILE}) 1617 local USE_BUILT=$(<${USEFILE})
1546 while [[ $# -gt 0 ]] ; do 1618 while [[ $# -gt 0 ]] ; do
1547 if [[ ${opt} = "-o" ]] ; then 1619 if [[ ${opt} = "-o" ]] ; then
1548 has $1 ${USE_BUILT} && return 0 1620 has $1 ${USE_BUILT} && return 0
1600# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1672# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1601# $5 == path for wrapper 1673# $5 == path for wrapper
1602make_wrapper() { 1674make_wrapper() {
1603 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1675 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1604 local tmpwrapper=$(emktemp) 1676 local tmpwrapper=$(emktemp)
1677 # We don't want to quote ${bin} so that people can pass complex
1678 # things as $bin ... "./someprog --args"
1605 cat << EOF > "${tmpwrapper}" 1679 cat << EOF > "${tmpwrapper}"
1606#!/bin/sh 1680#!/bin/sh
1607cd "${chdir}" 1681cd "${chdir:-.}"
1682if [ -n "${libdir}" ] ; then
1683 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1608export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1684 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1685 else
1686 export LD_LIBRARY_PATH="${libdir}"
1687 fi
1688fi
1609exec ${bin} "\$@" 1689exec ${bin} "\$@"
1610EOF 1690EOF
1611 chmod go+rx "${tmpwrapper}" 1691 chmod go+rx "${tmpwrapper}"
1612 if [ -n "${5}" ] 1692 if [[ -n ${path} ]] ; then
1613 then
1614 exeinto ${5} 1693 exeinto "${path}"
1615 newexe "${tmpwrapper}" "${wrapper}" 1694 newexe "${tmpwrapper}" "${wrapper}"
1616 else 1695 else
1617 newbin "${tmpwrapper}" "${wrapper}" 1696 newbin "${tmpwrapper}" "${wrapper}"
1618 fi 1697 fi
1619} 1698}

Legend:
Removed from v.1.180  
changed lines
  Added in v.1.252

  ViewVC Help
Powered by ViewVC 1.1.20