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

Diff of /eclass/eutils.eclass

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

Revision 1.184 Revision 1.256
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.184 2005/06/24 17:08:43 eradicator Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.256 2006/10/31 19:29:12 agriffis 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 userland_GNU? ( sys-apps/shadow ) )"
17# sys-apps/shadow is needed for useradd, etc, bug #94745.
18 13
19DESCRIPTION="Based on the ${ECLASS} eclass" 14DESCRIPTION="Based on the ${ECLASS} eclass"
20 15
21# 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
22# 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
23# 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
24# must be an integer greater than zero. 19# must be an integer greater than zero.
25# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
26epause() { 21epause() {
27 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then 22 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
28 sleep ${1:-5}
29 fi
30} 23}
31 24
32# 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
33# 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,
34# don't beep. 27# don't beep.
35# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 28# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
36ebeep() { 29ebeep() {
37 local n 30 local n
38 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then 31 if [[ -z ${EBEEP_IGNORE} ]] ; then
39 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 32 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
40 echo -ne "\a" 33 echo -ne "\a"
41 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null 34 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
42 echo -ne "\a" 35 echo -ne "\a"
43 sleep 1 36 sleep 1
62# to point to the latest version of the library present. 55# to point to the latest version of the library present.
63# 56#
64# <azarah@gentoo.org> (26 Oct 2002) 57# <azarah@gentoo.org> (26 Oct 2002)
65# 58#
66gen_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
67 local libdir="$(get_libdir)" 68 local lib libdir=$(get_libdir)
68 # Just make sure it exists 69 # Just make sure it exists
69 dodir /usr/${libdir} 70 dodir /usr/${libdir}
70 71
71 for lib in "${@}" ; do 72 for lib in "${@}" ; do
72 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 73 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
73 /* GNU ld script 74 /* GNU ld script
74 Since Gentoo has critical dynamic libraries 75 Since Gentoo has critical dynamic libraries
75 in /lib, and the static versions in /usr/lib, 76 in /lib, and the static versions in /usr/lib,
76 we need to have a "fake" dynamic lib in /usr/lib, 77 we need to have a "fake" dynamic lib in /usr/lib,
77 otherwise we run into linking problems. 78 otherwise we run into linking problems.
78 79
79 See bug http://bugs.gentoo.org/4411 for more info. 80 See bug http://bugs.gentoo.org/4411 for more info.
80 */ 81 */
81 GROUP ( /${libdir}/${lib} ) 82 GROUP ( /${libdir}/${lib} )
82 END_LDSCRIPT 83 END_LDSCRIPT
83 fperms a+x "/usr/${libdir}/${lib}" 84 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
84 done 85 done
85} 86}
86 87
87# Simple function to draw a line consisting of '=' the same length as $*
88# - only to be used by epatch()
89#
90# <azarah@gentoo.org> (11 Nov 2002)
91#
92draw_line() {
93 local i=0
94 local str_length=""
95
96 # Handle calls that do not have args, or wc not being installed ...
97 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
98 then
99 echo "==============================================================="
100 return 0
101 fi
102
103 # Get the length of $*
104 str_length="$(echo -n "$*" | wc -m)"
105
106 while [ "$i" -lt "${str_length}" ]
107 do
108 echo -n "="
109
110 i=$((i + 1))
111 done
112
113 echo
114
115 return 0
116}
117 88
118# Default directory where patches are located 89# Default directory where patches are located
119EPATCH_SOURCE="${WORKDIR}/patch" 90EPATCH_SOURCE="${WORKDIR}/patch"
120# Default extension for patches 91# Default extension for patches
121EPATCH_SUFFIX="patch.bz2" 92EPATCH_SUFFIX="patch.bz2"
122# Default options for patch 93# Default options for patch
123# 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
124# 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.
125EPATCH_OPTS="-g0 --no-backup-if-mismatch" 97EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
126# 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,
127# and not the full path .. 99# and not the full path ..
128EPATCH_EXCLUDE="" 100EPATCH_EXCLUDE=""
129# Change the printed message for a single patch. 101# Change the printed message for a single patch.
130EPATCH_SINGLE_MSG="" 102EPATCH_SINGLE_MSG=""
168# hand its a directory, it will set EPATCH_SOURCE to this. 140# hand its a directory, it will set EPATCH_SOURCE to this.
169# 141#
170# <azarah@gentoo.org> (10 Nov 2002) 142# <azarah@gentoo.org> (10 Nov 2002)
171# 143#
172epatch() { 144epatch() {
145 _epatch_draw_line() {
146 [[ -z $1 ]] && set "$(printf "%65s" '')"
147 echo "${1//?/=}"
148 }
149 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
173 local PIPE_CMD="" 150 local PIPE_CMD=""
174 local STDERR_TARGET="${T}/$$.out" 151 local STDERR_TARGET="${T}/$$.out"
175 local PATCH_TARGET="${T}/$$.patch" 152 local PATCH_TARGET="${T}/$$.patch"
176 local PATCH_SUFFIX="" 153 local PATCH_SUFFIX=""
177 local SINGLE_PATCH="no" 154 local SINGLE_PATCH="no"
178 local x="" 155 local x=""
156
157 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
179 158
180 if [ "$#" -gt 1 ] 159 if [ "$#" -gt 1 ]
181 then 160 then
182 local m="" 161 local m=""
183 for m in "$@" ; do 162 for m in "$@" ; do
284 263
285 # Allow for prefix to differ ... im lazy, so shoot me :/ 264 # Allow for prefix to differ ... im lazy, so shoot me :/
286 while [ "${count}" -lt 5 ] 265 while [ "${count}" -lt 5 ]
287 do 266 do
288 # Generate some useful debug info ... 267 # Generate some useful debug info ...
289 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 268 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
291 270
292 if [ "${PATCH_SUFFIX}" != "patch" ] 271 if [ "${PATCH_SUFFIX}" != "patch" ]
293 then 272 then
294 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 273 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
299 278
300 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 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##*/}
302 281
303 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
304 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
305 284
306 if [ "${PATCH_SUFFIX}" != "patch" ] 285 if [ "${PATCH_SUFFIX}" != "patch" ]
307 then 286 then
308 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
309 then 288 then
313 count=5 292 count=5
314 break 293 break
315 fi 294 fi
316 fi 295 fi
317 296
318 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
319 then 298 then
320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 299 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 301 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 303 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
325 304
326 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
327 307
328 if [ "$?" -ne 0 ] 308 if [ "$?" -ne 0 ]
329 then 309 then
330 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##*/}
331 echo 311 echo
377# vapier@gentoo.org 357# vapier@gentoo.org
378# 358#
379# Takes just 1 optional parameter (the directory to create tmpfile in) 359# Takes just 1 optional parameter (the directory to create tmpfile in)
380emktemp() { 360emktemp() {
381 local exe="touch" 361 local exe="touch"
382 [ "$1" == "-d" ] && exe="mkdir" && shift 362 [[ $1 == -d ]] && exe="mkdir" && shift
383 local topdir="$1" 363 local topdir=$1
384 364
385 if [ -z "${topdir}" ] 365 if [[ -z ${topdir} ]] ; then
386 then
387 [ -z "${T}" ] \ 366 [[ -z ${T} ]] \
388 && topdir="/tmp" \ 367 && topdir="/tmp" \
389 || topdir="${T}" 368 || topdir=${T}
390 fi 369 fi
391 370
392 if [ -z "$(type -p mktemp)" ] 371 if [[ -z $(type -p mktemp) ]] ; then
393 then
394 local tmp=/ 372 local tmp=/
395 while [ -e "${tmp}" ] ; do 373 while [[ -e ${tmp} ]] ; do
396 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 374 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
397 done 375 done
398 ${exe} "${tmp}" 376 ${exe} "${tmp}" || ${exe} -p "${tmp}"
399 echo "${tmp}" 377 echo "${tmp}"
400 else 378 else
401 [ "${exe}" == "touch" ] \ 379 if [[ ${exe} == "touch" ]] ; then
402 && exe="-p" \ 380 [[ ${USERLAND} == "GNU" ]] \
403 || exe="-d" 381 && mktemp -p "${topdir}" \
404 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
405 fi 388 fi
406} 389}
407 390
408# Small wrapper for getent (Linux), nidump (Mac OS X), 391# Small wrapper for getent (Linux), nidump (Mac OS X),
409# and pw (FreeBSD) used in enewuser()/enewgroup() 392# and pw (FreeBSD) used in enewuser()/enewgroup()
410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 393# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 394# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
412# 395#
413# egetent(database, key) 396# egetent(database, key)
414egetent() { 397egetent() {
415 if [[ "${USERLAND}" == "Darwin" ]] ; then 398 case ${CHOST} in
399 *-darwin*)
416 case "$2" in 400 case "$2" in
417 *[!0-9]*) # Non numeric 401 *[!0-9]*) # Non numeric
418 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 402 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
419 ;; 403 ;;
420 *) # Numeric 404 *) # Numeric
421 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 405 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
422 ;; 406 ;;
423 esac 407 esac
424 elif [[ "${USERLAND}" == "BSD" ]] ; then 408 ;;
425 local action 409 *-freebsd*|*-dragonfly*)
426 if [ "$1" == "passwd" ] 410 local opts action="user"
427 then 411 [[ $1 == "passwd" ]] || action="group"
428 action="user" 412
429 else 413 # lookup by uid/gid
430 action="group" 414 if [[ $2 == [[:digit:]]* ]] ; then
415 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
431 fi 416 fi
417
432 pw show "${action}" "$2" -q 418 pw show ${action} ${opts} "$2" -q
433 else 419 ;;
420 *-netbsd*|*-openbsd*)
421 grep "$2:\*:" /etc/$1
422 ;;
423 *)
434 which nscd >& /dev/null && nscd -i "$1" 424 type -p nscd >& /dev/null && nscd -i "$1"
435 getent "$1" "$2" 425 getent "$1" "$2"
436 fi 426 ;;
427 esac
437} 428}
438 429
439# Simplify/standardize adding users to the system 430# Simplify/standardize adding users to the system
440# vapier@gentoo.org 431# vapier@gentoo.org
441# 432#
448# shell: /bin/false 439# shell: /bin/false
449# homedir: /dev/null 440# homedir: /dev/null
450# groups: none 441# groups: none
451# extra: comment of 'added by portage for ${PN}' 442# extra: comment of 'added by portage for ${PN}'
452enewuser() { 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
453 # get the username 451 # get the username
454 local euser=$1; shift 452 local euser=$1; shift
455 if [[ -z ${euser} ]] ; then 453 if [[ -z ${euser} ]] ; 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) ]] ; then 459 if [[ -n $(egetent passwd "${euser}") ]] ; then
462 return 0 460 return 0
463 fi 461 fi
464 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
465 463
466 # options to pass to useradd 464 # options to pass to useradd
467 local opts= 465 local opts=
468 466
469 # handle uid 467 # handle uid
470 local euid=$1; shift 468 local euid=$1; shift
471 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then 469 if [[ -n ${euid} && ${euid} != -1 ]] ; then
472 if [[ ${euid} -gt 0 ]] ; then 470 if [[ ${euid} -gt 0 ]] ; then
473 if [[ ! -z $(egetent passwd ${euid}) ]] ; then 471 if [[ -n $(egetent passwd ${euid}) ]] ; then
474 euid="next" 472 euid="next"
475 fi 473 fi
476 else 474 else
477 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
478 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
479 fi 477 fi
480 else 478 else
481 euid="next" 479 euid="next"
482 fi 480 fi
483 if [[ ${euid} == "next" ]] ; then 481 if [[ ${euid} == "next" ]] ; then
484 local pwrange 482 for ((euid = 101; euid <= 999; euid++)); do
485 if [[ ${USERLAND} == "BSD" ]] ; then
486 pwrange=$(jot 898 101)
487 else
488 pwrange=$(seq 101 999)
489 fi
490 for euid in ${pwrange} ; do
491 [[ -z $(egetent passwd ${euid}) ]] && break 483 [[ -z $(egetent passwd ${euid}) ]] && break
492 done 484 done
493 fi 485 fi
494 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
495 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
496 488
497 # handle shell 489 # handle shell
498 local eshell=$1; shift 490 local eshell=$1; shift
499 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
500 if [[ ! -e ${eshell} ]] ; then 492 if [[ ! -e ${ROOT}${eshell} ]] ; then
501 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
502 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"
503 fi 499 fi
504 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."
505 case ${USERLAND} in 507 case ${USERLAND} in
506 Darwin) eshell="/usr/bin/false";; 508 GNU) shell="/bin/false" ;;
507 BSD) eshell="/usr/sbin/nologin";; 509 BSD) shell="/sbin/nologin" ;;
508 *) eshell="/bin/false";; 510 Darwin) shell="/usr/sbin/nologin" ;;
511 *) die "Unable to identify the default shell for userland ${USERLAND}"
509 esac 512 esac
513 fi
514
515 eshell=${shell}
510 fi 516 fi
511 einfo " - Shell: ${eshell}" 517 einfo " - Shell: ${eshell}"
512 opts="${opts} -s ${eshell}" 518 opts="${opts} -s ${eshell}"
513 519
514 # handle homedir 520 # handle homedir
551 einfo " - Groups: ${egroups}" 557 einfo " - Groups: ${egroups}"
552 558
553 # handle extra and add the user 559 # handle extra and add the user
554 local oldsandbox=${SANDBOX_ON} 560 local oldsandbox=${SANDBOX_ON}
555 export SANDBOX_ON="0" 561 export SANDBOX_ON="0"
556 case ${USERLAND} in 562 case ${CHOST} in
557 Darwin) 563 *-darwin*)
558 ### Make the user 564 ### Make the user
559 if [[ -z $@ ]] ; then 565 if [[ -z $@ ]] ; then
560 dscl . create /users/${euser} uid ${euid} 566 dscl . create /users/${euser} uid ${euid}
561 dscl . create /users/${euser} shell ${eshell} 567 dscl . create /users/${euser} shell ${eshell}
562 dscl . create /users/${euser} home ${ehome} 568 dscl . create /users/${euser} home ${ehome}
573 einfo "Please report the ebuild along with the info below" 579 einfo "Please report the ebuild along with the info below"
574 einfo "eextra: $@" 580 einfo "eextra: $@"
575 die "Required function missing" 581 die "Required function missing"
576 fi 582 fi
577 ;; 583 ;;
578 BSD) 584 *-freebsd*|*-dragonfly*)
579 if [[ -z $@ ]] ; then 585 if [[ -z $@ ]] ; then
580 pw useradd ${euser} ${opts} \ 586 pw useradd ${euser} ${opts} \
581 -c "added by portage for ${PN}" \ 587 -c "added by portage for ${PN}" \
582 die "enewuser failed" 588 die "enewuser failed"
583 else 589 else
584 einfo " - Extra: $@" 590 einfo " - Extra: $@"
585 pw useradd ${euser} ${opts} \ 591 pw useradd ${euser} ${opts} \
586 "$@" || die "enewuser failed" 592 "$@" || die "enewuser failed"
587 fi 593 fi
588 ;; 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
589 *) 618 *)
590 if [[ -z $@ ]] ; then 619 if [[ -z $@ ]] ; then
591 useradd ${opts} ${euser} \ 620 useradd ${opts} ${euser} \
592 -c "added by portage for ${PN}" \ 621 -c "added by portage for ${PN}" \
593 || die "enewuser failed" 622 || die "enewuser failed"
596 useradd ${opts} ${euser} "$@" \ 625 useradd ${opts} ${euser} "$@" \
597 || die "enewuser failed" 626 || die "enewuser failed"
598 fi 627 fi
599 ;; 628 ;;
600 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
601 export SANDBOX_ON=${oldsandbox} 638 export SANDBOX_ON=${oldsandbox}
602
603 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
604 then
605 einfo " - Creating ${ehome} in ${D}"
606 dodir ${ehome}
607 fowners ${euser} ${ehome}
608 fperms 755 ${ehome}
609 fi
610} 639}
611 640
612# Simplify/standardize adding groups to the system 641# Simplify/standardize adding groups to the system
613# vapier@gentoo.org 642# vapier@gentoo.org
614# 643#
617# Default values if you do not specify any: 646# Default values if you do not specify any:
618# groupname: REQUIRED ! 647# groupname: REQUIRED !
619# gid: next available (see groupadd(8)) 648# gid: next available (see groupadd(8))
620# extra: none 649# extra: none
621enewgroup() { 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
622 # get the group 658 # get the group
623 local egroup="$1"; shift 659 local egroup="$1"; shift
624 if [ -z "${egroup}" ] 660 if [ -z "${egroup}" ]
625 then 661 then
626 eerror "No group specified !" 662 eerror "No group specified !"
627 die "Cannot call enewgroup without a group" 663 die "Cannot call enewgroup without a group"
628 fi 664 fi
629 665
630 # see if group already exists 666 # see if group already exists
631 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 667 if [[ -n $(egetent group "${egroup}") ]]; then
632 then
633 return 0 668 return 0
634 fi 669 fi
635 einfo "Adding group '${egroup}' to your system ..." 670 einfo "Adding group '${egroup}' to your system ..."
636 671
637 # options to pass to useradd 672 # options to pass to useradd
643 then 678 then
644 if [ "${egid}" -gt 0 ] 679 if [ "${egid}" -gt 0 ]
645 then 680 then
646 if [ -z "`egetent group ${egid}`" ] 681 if [ -z "`egetent group ${egid}`" ]
647 then 682 then
648 if [[ "${USERLAND}" == "Darwin" ]]; then 683 if [[ "${CHOST}" == *-darwin* ]]; then
649 opts="${opts} ${egid}" 684 opts="${opts} ${egid}"
650 else 685 else
651 opts="${opts} -g ${egid}" 686 opts="${opts} -g ${egid}"
652 fi 687 fi
653 else 688 else
667 opts="${opts} ${eextra}" 702 opts="${opts} ${eextra}"
668 703
669 # add the group 704 # add the group
670 local oldsandbox="${SANDBOX_ON}" 705 local oldsandbox="${SANDBOX_ON}"
671 export SANDBOX_ON="0" 706 export SANDBOX_ON="0"
672 if [[ "${USERLAND}" == "Darwin" ]]; then 707 case ${CHOST} in
708 *-darwin*)
673 if [ ! -z "${eextra}" ]; 709 if [ ! -z "${eextra}" ];
674 then 710 then
675 einfo "Extra options are not supported on Darwin/OS X yet" 711 einfo "Extra options are not supported on Darwin/OS X yet"
676 einfo "Please report the ebuild along with the info below" 712 einfo "Please report the ebuild along with the info below"
677 einfo "eextra: ${eextra}" 713 einfo "eextra: ${eextra}"
678 die "Required function missing" 714 die "Required function missing"
679 fi 715 fi
680 716
681 # If we need the next available 717 # If we need the next available
682 case ${egid} in 718 case ${egid} in
683 *[!0-9]*) # Non numeric 719 *[!0-9]*) # Non numeric
684 for egid in `jot 898 101`; do 720 for ((egid = 101; egid <= 999; egid++)); do
685 [ -z "`egetent group ${egid}`" ] && break 721 [[ -z $(egetent group ${egid}) ]] && break
686 done 722 done
687 esac 723 esac
688 dscl . create /groups/${egroup} gid ${egid} 724 dscl . create /groups/${egroup} gid ${egid}
689 dscl . create /groups/${egroup} passwd '*' 725 dscl . create /groups/${egroup} passwd '*'
690 elif [[ "${USERLAND}" == "BSD" ]] ; then 726 ;;
727
728 *-freebsd*|*-dragonfly*)
691 case ${egid} in 729 case ${egid} in
692 *[!0-9]*) # Non numeric 730 *[!0-9]*) # Non numeric
693 for egid in `jot 898 101`; do 731 for ((egid = 101; egid <= 999; egid++)); do
694 [ -z "`egetent group ${egid}`" ] && break 732 [[ -z $(egetent group ${egid}) ]] && break
695 done 733 done
696 esac 734 esac
697 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 735 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
698 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 *)
699 groupadd ${opts} ${egroup} || die "enewgroup failed" 749 groupadd ${opts} ${egroup} || die "enewgroup failed"
700 fi 750 ;;
751 esac
701 export SANDBOX_ON="${oldsandbox}" 752 export SANDBOX_ON="${oldsandbox}"
702} 753}
703 754
704# Simple script to replace 'dos2unix' binaries 755# Simple script to replace 'dos2unix' binaries
705# vapier@gentoo.org 756# vapier@gentoo.org
722 773
723# Make a desktop file ! 774# Make a desktop file !
724# Great for making those icons in kde/gnome startmenu ! 775# Great for making those icons in kde/gnome startmenu !
725# Amaze your friends ! Get the women ! Join today ! 776# Amaze your friends ! Get the women ! Join today !
726# 777#
727# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 778# make_desktop_entry(<command>, [name], [icon], [type], [path])
728# 779#
729# binary: what binary does the app run with ? 780# binary: what command does the app run with ?
730# name: the name that will show up in the menu 781# name: the name that will show up in the menu
731# icon: give your little like a pretty little icon ... 782# icon: give your little like a pretty little icon ...
732# this can be relative (to /usr/share/pixmaps) or 783# this can be relative (to /usr/share/pixmaps) or
733# a full path to an icon 784# a full path to an icon
734# type: what kind of application is this ? for categories: 785# type: what kind of application is this ? for categories:
735# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 786# http://www.freedesktop.org/Standards/desktop-entry-spec
736# path: if your app needs to startup in a specific dir 787# path: if your app needs to startup in a specific dir
737make_desktop_entry() { 788make_desktop_entry() {
738 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 789 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
739 790
740 local exec=${1} 791 local exec=${1}
766 dev) 817 dev)
767 type="Development" 818 type="Development"
768 ;; 819 ;;
769 820
770 games) 821 games)
771 [[ -z ${path} ]] && path=${GAMES_BINDIR}
772
773 case ${catmin} in 822 case ${catmin} in
774 action) type=ActionGame;; 823 action) type=ActionGame;;
775 arcade) type=ArcadeGame;; 824 arcade) type=ArcadeGame;;
776 board) type=BoardGame;; 825 board) type=BoardGame;;
777 kid) type=KidsGame;; 826 kids) type=KidsGame;;
778 emulation) type=Emulator;; 827 emulation) type=Emulator;;
779 puzzle) type=LogicGame;; 828 puzzle) type=LogicGame;;
780 rpg) type=RolePlaying;; 829 rpg) type=RolePlaying;;
781 roguelike) type=RolePlaying;; 830 roguelike) type=RolePlaying;;
782 simulation) type=Simulation;; 831 simulation) type=Simulation;;
818 type="Network;${type}" 867 type="Network;${type}"
819 ;; 868 ;;
820 869
821 sci) 870 sci)
822 case ${catmin} in 871 case ${catmin} in
823 astro*) type=Astronomoy;; 872 astro*) type=Astronomy;;
824 bio*) type=Biology;; 873 bio*) type=Biology;;
825 calc*) type=Calculator;; 874 calc*) type=Calculator;;
826 chem*) type=Chemistry;; 875 chem*) type=Chemistry;;
827 geo*) type=Geology;; 876 geo*) type=Geology;;
828 math*) type=Math;; 877 math*) type=Math;;
848 local desktop_name="${PN}" 897 local desktop_name="${PN}"
849 else 898 else
850 local desktop_name="${PN}-${SLOT}" 899 local desktop_name="${PN}-${SLOT}"
851 fi 900 fi
852 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 901 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
902# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
853 903
854echo "[Desktop Entry] 904echo "[Desktop Entry]
855Encoding=UTF-8 905Encoding=UTF-8
856Version=0.9.2 906Version=0.9.2
857Name=${name} 907Name=${name}
858Type=Application 908Type=Application
859Comment=${DESCRIPTION} 909Comment=${DESCRIPTION}
860Exec=${exec} 910Exec=${exec}
911TryExec=${exec%% *}
861Path=${path} 912Path=${path}
862Icon=${icon} 913Icon=${icon}
863Categories=Application;${type};" > "${desktop}" 914Categories=Application;${type};" > "${desktop}"
864 915
916 (
917 # wrap the env here so that the 'insinto' call
918 # doesn't corrupt the env of the caller
865 insinto /usr/share/applications 919 insinto /usr/share/applications
866 doins "${desktop}" 920 doins "${desktop}"
867 921 )
868 return 0
869} 922}
870 923
871# Make a GDM/KDM Session file 924# Make a GDM/KDM Session file
872# 925#
873# make_desktop_entry(<title>, <command>) 926# make_session_desktop(<title>, <command>)
874# title: File to execute to start the Window Manager 927# title: File to execute to start the Window Manager
875# command: Name of the Window Manager 928# command: Name of the Window Manager
876 929
877make_session_desktop() { 930make_session_desktop() {
878 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 931 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
902 doins "${i}" 955 doins "${i}"
903 elif [[ -d ${i} ]] ; then 956 elif [[ -d ${i} ]] ; then
904 for j in "${i}"/*.desktop ; do 957 for j in "${i}"/*.desktop ; do
905 doins "${j}" 958 doins "${j}"
906 done 959 done
907 fi 960 fi
908 done 961 done
909} 962}
910newmenu() { 963newmenu() {
911 insinto /usr/share/applications 964 insinto /usr/share/applications
912 newins "$1" "$2" 965 newins "$1" "$2"
920 doins "${i}" 973 doins "${i}"
921 elif [[ -d ${i} ]] ; then 974 elif [[ -d ${i} ]] ; then
922 for j in "${i}"/*.png ; do 975 for j in "${i}"/*.png ; do
923 doins "${j}" 976 doins "${j}"
924 done 977 done
925 fi 978 fi
926 done 979 done
927} 980}
928newicon() { 981newicon() {
929 insinto /usr/share/pixmaps 982 insinto /usr/share/pixmaps
930 newins "$1" "$2" 983 newins "$1" "$2"
935############################################################## 988##############################################################
936 989
937 990
938# for internal use only (unpack_pdv and unpack_makeself) 991# for internal use only (unpack_pdv and unpack_makeself)
939find_unpackable_file() { 992find_unpackable_file() {
940 local src="$1" 993 local src=$1
941 if [ -z "${src}" ] 994 if [[ -z ${src} ]] ; then
942 then
943 src="${DISTDIR}/${A}" 995 src=${DISTDIR}/${A}
944 else 996 else
945 if [ -e "${DISTDIR}/${src}" ] 997 if [[ -e ${DISTDIR}/${src} ]] ; then
946 then
947 src="${DISTDIR}/${src}" 998 src=${DISTDIR}/${src}
948 elif [ -e "${PWD}/${src}" ] 999 elif [[ -e ${PWD}/${src} ]] ; then
949 then
950 src="${PWD}/${src}" 1000 src=${PWD}/${src}
951 elif [ -e "${src}" ] 1001 elif [[ -e ${src} ]] ; then
952 then
953 src="${src}" 1002 src=${src}
954 fi
955 fi 1003 fi
956 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 1004 fi
1005 [[ ! -e ${src} ]] && return 1
957 echo "${src}" 1006 echo "${src}"
958} 1007}
959 1008
960# Unpack those pesky pdv generated files ... 1009# Unpack those pesky pdv generated files ...
961# They're self-unpacking programs with the binary package stuffed in 1010# They're self-unpacking programs with the binary package stuffed in
976# lseek 1025# lseek
977# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1026# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
978# lseek(3, -4, SEEK_END) = 2981250 1027# lseek(3, -4, SEEK_END) = 2981250
979# thus we would pass in the value of '4' as the second parameter. 1028# thus we would pass in the value of '4' as the second parameter.
980unpack_pdv() { 1029unpack_pdv() {
981 local src="`find_unpackable_file $1`" 1030 local src=$(find_unpackable_file $1)
982 local sizeoff_t="$2" 1031 local sizeoff_t=$2
983 1032
1033 [[ -z ${src} ]] && die "Could not locate source for '$1'"
984 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1034 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
985 1035
986 local shrtsrc="`basename ${src}`" 1036 local shrtsrc=$(basename "${src}")
987 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1037 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
988 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1038 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
989 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1039 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
990 1040
991 # grab metadata for debug reasons 1041 # grab metadata for debug reasons
1055# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1105# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1056# - If the file is not specified then unpack will utilize ${A}. 1106# - If the file is not specified then unpack will utilize ${A}.
1057# - If the offset is not specified then we will attempt to extract 1107# - If the offset is not specified then we will attempt to extract
1058# the proper offset from the script itself. 1108# the proper offset from the script itself.
1059unpack_makeself() { 1109unpack_makeself() {
1110 local src_input=${1:-${A}}
1060 local src="$(find_unpackable_file "$1")" 1111 local src=$(find_unpackable_file "${src_input}")
1061 local skip="$2" 1112 local skip=$2
1062 local exe="$3" 1113 local exe=$3
1063 1114
1115 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1116
1064 local shrtsrc="$(basename "${src}")" 1117 local shrtsrc=$(basename "${src}")
1065 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1118 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1066 if [ -z "${skip}" ] 1119 if [[ -z ${skip} ]] ; then
1067 then
1068 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1120 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1069 local skip=0 1121 local skip=0
1070 exe=tail 1122 exe=tail
1071 case ${ver} in 1123 case ${ver} in
1072 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1124 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1073 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1125 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1074 ;; 1126 ;;
1075 2.0|2.0.1) 1127 2.0|2.0.1)
1076 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1128 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1077 ;; 1129 ;;
1085 ;; 1137 ;;
1086 2.1.3) 1138 2.1.3)
1087 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1139 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1088 let skip="skip + 1" 1140 let skip="skip + 1"
1089 ;; 1141 ;;
1090 2.1.4) 1142 2.1.4|2.1.5)
1091 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1143 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1092 skip=$(head -n ${skip} "${src}" | wc -c) 1144 skip=$(head -n ${skip} "${src}" | wc -c)
1093 exe="dd" 1145 exe="dd"
1094 ;; 1146 ;;
1095 *) 1147 *)
1140check_license() { 1192check_license() {
1141 local lic=$1 1193 local lic=$1
1142 if [ -z "${lic}" ] ; then 1194 if [ -z "${lic}" ] ; then
1143 lic="${PORTDIR}/licenses/${LICENSE}" 1195 lic="${PORTDIR}/licenses/${LICENSE}"
1144 else 1196 else
1145 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1197 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1146 lic="${PORTDIR}/licenses/${src}" 1198 lic="${PORTDIR}/licenses/${lic}"
1147 elif [ -e "${PWD}/${src}" ] ; then 1199 elif [ -e "${PWD}/${lic}" ] ; then
1148 lic="${PWD}/${src}" 1200 lic="${PWD}/${lic}"
1149 elif [ -e "${src}" ] ; then 1201 elif [ -e "${lic}" ] ; then
1150 lic="${src}" 1202 lic="${lic}"
1151 fi
1152 fi 1203 fi
1204 fi
1153 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1205 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1154 local l="`basename ${lic}`" 1206 local l="`basename ${lic}`"
1155 1207
1156 # here is where we check for the licenses the user already 1208 # here is where we check for the licenses the user already
1157 # accepted ... if we don't find a match, we make the user accept 1209 # accepted ... if we don't find a match, we make the user accept
1158 local shopts=$- 1210 local shopts=$-
1159 local alic 1211 local alic
1160 set -o noglob #so that bash doesn't expand "*" 1212 set -o noglob #so that bash doesn't expand "*"
1161 for alic in ${ACCEPT_LICENSE} ; do 1213 for alic in ${ACCEPT_LICENSE} ; do
1162 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1214 if [[ ${alic} == ${l} ]]; then
1163 set +o noglob; set -${shopts} #reset old shell opts 1215 set +o noglob; set -${shopts} #reset old shell opts
1164 return 0 1216 return 0
1165 fi 1217 fi
1166 done 1218 done
1167 set +o noglob; set -$shopts #reset old shell opts 1219 set +o noglob; set -$shopts #reset old shell opts
1200# and when the function returns, you can assume that the cd has been 1252# and when the function returns, you can assume that the cd has been
1201# found at CDROM_ROOT. 1253# found at CDROM_ROOT.
1202# 1254#
1203# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1255# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1204# etc... if you want to give the cds better names, then just export 1256# etc... if you want to give the cds better names, then just export
1205# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1257# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1258# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1259# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1260# CDROM_NAME_2="data cd"
1261# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1206# 1262#
1207# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1263# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1208# 1264#
1209# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1265# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1210# - this will attempt to locate a cd based upon a file that is on 1266# - this will attempt to locate a cd based upon a file that is on
1214 # first we figure out how many cds we're dealing with by 1270 # first we figure out how many cds we're dealing with by
1215 # the # of files they gave us 1271 # the # of files they gave us
1216 local cdcnt=0 1272 local cdcnt=0
1217 local f= 1273 local f=
1218 for f in "$@" ; do 1274 for f in "$@" ; do
1219 cdcnt=$((cdcnt + 1)) 1275 ((++cdcnt))
1220 export CDROM_CHECK_${cdcnt}="$f" 1276 export CDROM_CHECK_${cdcnt}="$f"
1221 done 1277 done
1222 export CDROM_TOTAL_CDS=${cdcnt} 1278 export CDROM_TOTAL_CDS=${cdcnt}
1223 export CDROM_CURRENT_CD=1 1279 export CDROM_CURRENT_CD=1
1224 1280
1225 # now we see if the user gave use CD_ROOT ... 1281 # now we see if the user gave use CD_ROOT ...
1226 # if they did, let's just believe them that it's correct 1282 # if they did, let's just believe them that it's correct
1227 if [[ ! -z ${CD_ROOT} ]] ; then
1228 export CDROM_ROOT=${CD_ROOT}
1229 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1230 return
1231 fi
1232 # do the same for CD_ROOT_X
1233 if [[ ! -z ${CD_ROOT_1} ]] ; then 1283 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1234 local var= 1284 local var=
1235 cdcnt=0 1285 cdcnt=0
1236 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1286 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1237 cdcnt=$((cdcnt + 1)) 1287 ((++cdcnt))
1238 var="CD_ROOT_${cdcnt}" 1288 var="CD_ROOT_${cdcnt}"
1289 [[ -z ${!var} ]] && var="CD_ROOT"
1239 if [[ -z ${!var} ]] ; then 1290 if [[ -z ${!var} ]] ; then
1240 eerror "You must either use just the CD_ROOT" 1291 eerror "You must either use just the CD_ROOT"
1241 eerror "or specify ALL the CD_ROOT_X variables." 1292 eerror "or specify ALL the CD_ROOT_X variables."
1242 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1293 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1243 die "could not locate CD_ROOT_${cdcnt}" 1294 die "could not locate CD_ROOT_${cdcnt}"
1244 fi 1295 fi
1245 export CDROM_ROOTS_${cdcnt}="${!var}"
1246 done 1296 done
1247 export CDROM_ROOT=${CDROM_ROOTS_1} 1297 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1248 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1298 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1299 export CDROM_SET=-1
1300 for f in ${CDROM_CHECK_1//:/ } ; do
1301 ((++CDROM_SET))
1302 [[ -e ${CD_ROOT}/${f} ]] && break
1303 done
1304 export CDROM_MATCH=${f}
1249 return 1305 return
1250 fi 1306 fi
1251 1307
1308 # User didn't help us out so lets make sure they know they can
1309 # simplify the whole process ...
1252 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1310 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1253 einfon "This ebuild will need the " 1311 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1254 if [[ -z ${CDROM_NAME} ]] ; then
1255 echo "cdrom for ${PN}."
1256 else
1257 echo "${CDROM_NAME}."
1258 fi
1259 echo 1312 echo
1260 einfo "If you do not have the CD, but have the data files" 1313 einfo "If you do not have the CD, but have the data files"
1261 einfo "mounted somewhere on your filesystem, just export" 1314 einfo "mounted somewhere on your filesystem, just export"
1262 einfo "the variable CD_ROOT so that it points to the" 1315 einfo "the variable CD_ROOT so that it points to the"
1263 einfo "directory containing the files." 1316 einfo "directory containing the files."
1264 echo 1317 echo
1265 einfo "For example:" 1318 einfo "For example:"
1266 einfo "export CD_ROOT=/mnt/cdrom" 1319 einfo "export CD_ROOT=/mnt/cdrom"
1267 echo 1320 echo
1268 else 1321 else
1322 if [[ -n ${CDROM_NAME_SET} ]] ; then
1323 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1324 cdcnt=0
1325 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1326 ((++cdcnt))
1327 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1328 done
1329 fi
1330
1269 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1331 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1270 cdcnt=0 1332 cdcnt=0
1271 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1333 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1272 cdcnt=$((cdcnt + 1)) 1334 ((++cdcnt))
1273 var="CDROM_NAME_${cdcnt}" 1335 var="CDROM_NAME_${cdcnt}"
1274 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1336 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1275 done 1337 done
1276 echo 1338 echo
1277 einfo "If you do not have the CDs, but have the data files" 1339 einfo "If you do not have the CDs, but have the data files"
1278 einfo "mounted somewhere on your filesystem, just export" 1340 einfo "mounted somewhere on your filesystem, just export"
1279 einfo "the following variables so they point to the right place:" 1341 einfo "the following variables so they point to the right place:"
1280 einfon "" 1342 einfon ""
1281 cdcnt=0 1343 cdcnt=0
1282 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1344 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1283 cdcnt=$((cdcnt + 1)) 1345 ((++cdcnt))
1284 echo -n " CD_ROOT_${cdcnt}" 1346 echo -n " CD_ROOT_${cdcnt}"
1285 done 1347 done
1286 echo 1348 echo
1287 einfo "Or, if you have all the files in the same place, or" 1349 einfo "Or, if you have all the files in the same place, or"
1288 einfo "you only have one cdrom, you can export CD_ROOT" 1350 einfo "you only have one cdrom, you can export CD_ROOT"
1291 echo 1353 echo
1292 einfo "For example:" 1354 einfo "For example:"
1293 einfo "export CD_ROOT_1=/mnt/cdrom" 1355 einfo "export CD_ROOT_1=/mnt/cdrom"
1294 echo 1356 echo
1295 fi 1357 fi
1358
1359 export CDROM_SET=""
1296 export CDROM_CURRENT_CD=0 1360 export CDROM_CURRENT_CD=0
1297 cdrom_load_next_cd 1361 cdrom_load_next_cd
1298} 1362}
1299 1363
1300# this is only used when you need access to more than one cd. 1364# this is only used when you need access to more than one cd.
1301# when you have finished using the first cd, just call this function. 1365# when you have finished using the first cd, just call this function.
1302# when it returns, CDROM_ROOT will be pointing to the second cd. 1366# when it returns, CDROM_ROOT will be pointing to the second cd.
1303# remember, you can only go forward in the cd chain, you can't go back. 1367# remember, you can only go forward in the cd chain, you can't go back.
1304cdrom_load_next_cd() { 1368cdrom_load_next_cd() {
1305 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1306 local var= 1369 local var
1307 1370 ((++CDROM_CURRENT_CD))
1308 if [[ ! -z ${CD_ROOT} ]] ; then
1309 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1310 return
1311 fi
1312 1371
1313 unset CDROM_ROOT 1372 unset CDROM_ROOT
1314 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1373 var=CD_ROOT_${CDROM_CURRENT_CD}
1374 [[ -z ${!var} ]] && var="CD_ROOT"
1315 if [[ -z ${!var} ]] ; then 1375 if [[ -z ${!var} ]] ; then
1316 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1376 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1317 cdrom_locate_file_on_cd ${!var} 1377 _cdrom_locate_file_on_cd ${!var}
1318 else 1378 else
1319 export CDROM_ROOT=${!var} 1379 export CDROM_ROOT=${!var}
1320 fi 1380 fi
1321 1381
1322 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1382 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1327# all it does is try to locate a give file on a cd ... if the cd isn't 1387# all it does is try to locate a give file on a cd ... if the cd isn't
1328# found, then a message asking for the user to insert the cdrom will be 1388# found, then a message asking for the user to insert the cdrom will be
1329# displayed and we'll hang out here until: 1389# displayed and we'll hang out here until:
1330# (1) the file is found on a mounted cdrom 1390# (1) the file is found on a mounted cdrom
1331# (2) the user hits CTRL+C 1391# (2) the user hits CTRL+C
1332cdrom_locate_file_on_cd() { 1392_cdrom_locate_file_on_cd() {
1393 local mline=""
1394 local showedmsg=0
1395
1333 while [[ -z ${CDROM_ROOT} ]] ; do 1396 while [[ -z ${CDROM_ROOT} ]] ; do
1397 local i=0
1398 local -a cdset=(${*//:/ })
1399 if [[ -n ${CDROM_SET} ]] ; then
1400 cdset=(${cdset[${CDROM_SET}]})
1401 fi
1402
1403 while [[ -n ${cdset[${i}]} ]] ; do
1334 local dir="$(dirname ${@})" 1404 local dir=$(dirname ${cdset[${i}]})
1335 local file="$(basename ${@})" 1405 local file=$(basename ${cdset[${i}]})
1336 local mline=""
1337 local showedmsg=0
1338 1406
1339 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1407 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1340 [[ -d ${mline}/${dir} ]] || continue 1408 [[ -d ${mline}/${dir} ]] || continue
1341 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1409 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1342 && export CDROM_ROOT=${mline} 1410 export CDROM_ROOT=${mline}
1411 export CDROM_SET=${i}
1412 export CDROM_MATCH=${cdset[${i}]}
1413 return
1414 fi
1415 done
1416
1417 ((++i))
1343 done 1418 done
1344 1419
1345 if [[ -z ${CDROM_ROOT} ]] ; then
1346 echo 1420 echo
1347 if [[ ${showedmsg} -eq 0 ]] ; then 1421 if [[ ${showedmsg} -eq 0 ]] ; then
1348 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1422 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1349 if [[ -z ${CDROM_NAME} ]] ; then 1423 if [[ -z ${CDROM_NAME} ]] ; then
1350 einfo "Please insert the cdrom for ${PN} now !" 1424 einfo "Please insert+mount the cdrom for ${PN} now !"
1351 else
1352 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1353 fi
1354 else 1425 else
1355 if [[ -z ${CDROM_NAME_1} ]] ; then
1356 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1357 else
1358 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1359 einfo "Please insert+mount the ${!var} cdrom now !" 1426 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1360 fi
1361 fi 1427 fi
1362 showedmsg=1 1428 else
1429 if [[ -z ${CDROM_NAME_1} ]] ; then
1430 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1431 else
1432 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1433 einfo "Please insert+mount the ${!var} cdrom now !"
1434 fi
1363 fi 1435 fi
1436 showedmsg=1
1437 fi
1364 einfo "Press return to scan for the cd again" 1438 einfo "Press return to scan for the cd again"
1365 einfo "or hit CTRL+C to abort the emerge." 1439 einfo "or hit CTRL+C to abort the emerge."
1366 echo 1440 echo
1367 einfo "If you are having trouble with the detection" 1441 einfo "If you are having trouble with the detection"
1368 einfo "of your CD, it is possible that you do not have" 1442 einfo "of your CD, it is possible that you do not have"
1369 einfo "Joliet support enabled in your kernel. Please" 1443 einfo "Joliet support enabled in your kernel. Please"
1370 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1444 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1371 read 1445 read || die "something is screwed with your system"
1372 fi
1373 done 1446 done
1374} 1447}
1375 1448
1376# Make sure that LINGUAS only contains languages that 1449# Make sure that LINGUAS only contains languages that
1377# a package can support 1450# a package can support
1384# The -i builds a list of po files found in all the 1457# The -i builds a list of po files found in all the
1385# directories and uses the intersection of the lists. 1458# directories and uses the intersection of the lists.
1386# The -u builds a list of po files found in all the 1459# The -u builds a list of po files found in all the
1387# directories and uses the union of the lists. 1460# directories and uses the union of the lists.
1388strip-linguas() { 1461strip-linguas() {
1389 local ls newls 1462 local ls newls nols
1390 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1463 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1391 local op=$1; shift 1464 local op=$1; shift
1392 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1465 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1393 local d f 1466 local d f
1394 for d in "$@" ; do 1467 for d in "$@" ; do
1395 if [[ ${op} == "-u" ]] ; then 1468 if [[ ${op} == "-u" ]] ; then
1396 newls=${ls} 1469 newls=${ls}
1397 else 1470 else
1398 newls="" 1471 newls=""
1399 fi 1472 fi
1400 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1473 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1401 if [[ ${op} == "-i" ]] ; then 1474 if [[ ${op} == "-i" ]] ; then
1402 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1475 hasq ${f} ${ls} && newls="${newls} ${f}"
1403 else 1476 else
1404 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1477 hasq ${f} ${ls} || newls="${newls} ${f}"
1405 fi 1478 fi
1406 done 1479 done
1407 ls=${newls} 1480 ls=${newls}
1408 done 1481 done
1409 ls=${ls//.po}
1410 else 1482 else
1411 ls=$@ 1483 ls="$@"
1412 fi 1484 fi
1413 1485
1414 ls=" ${ls} " 1486 nols=""
1415 newls="" 1487 newls=""
1416 for f in ${LINGUAS} ; do 1488 for f in ${LINGUAS} ; do
1417 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1489 if hasq ${f} ${ls} ; then
1418 newls="${newls} ${f}" 1490 newls="${newls} ${f}"
1419 else 1491 else
1420 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1492 nols="${nols} ${f}"
1421 fi 1493 fi
1422 done 1494 done
1423 if [[ -z ${newls} ]] ; then 1495 [[ -n ${nols} ]] \
1424 export LINGUAS="" 1496 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1425 else
1426 export LINGUAS=${newls:1} 1497 export LINGUAS=${newls:1}
1427 fi
1428} 1498}
1429 1499
1430# moved from kernel.eclass since they are generally useful outside of 1500# moved from kernel.eclass since they are generally useful outside of
1431# kernel.eclass -iggy (20041002) 1501# kernel.eclass -iggy (20041002)
1432 1502
1461 1531
1462# Jeremy Huddleston <eradicator@gentoo.org>: 1532# Jeremy Huddleston <eradicator@gentoo.org>:
1463# preserve_old_lib /path/to/libblah.so.0 1533# preserve_old_lib /path/to/libblah.so.0
1464# preserve_old_lib_notify /path/to/libblah.so.0 1534# preserve_old_lib_notify /path/to/libblah.so.0
1465# 1535#
1466# These functions are useful when a lib in your package changes --soname. Such 1536# These functions are useful when a lib in your package changes --library. Such
1467# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1537# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1468# would break packages that link against it. Most people get around this 1538# would break packages that link against it. Most people get around this
1469# by using the portage SLOT mechanism, but that is not always a relevant 1539# by using the portage SLOT mechanism, but that is not always a relevant
1470# solution, so instead you can add the following to your ebuilds: 1540# solution, so instead you can add the following to your ebuilds:
1471# 1541#
1498 LIB=$1 1568 LIB=$1
1499 1569
1500 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1570 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1501 SONAME=`basename ${LIB}` 1571 SONAME=`basename ${LIB}`
1502 1572
1503 einfo "An old version of an installed library was detected on your system." 1573 ewarn "An old version of an installed library was detected on your system."
1504 einfo "In order to avoid breaking packages that link against it, this older version" 1574 ewarn "In order to avoid breaking packages that link against it, this older version"
1505 einfo "is not being removed. In order to make full use of this newer version," 1575 ewarn "is not being removed. In order to make full use of this newer version,"
1506 einfo "you will need to execute the following command:" 1576 ewarn "you will need to execute the following command:"
1507 einfo " revdep-rebuild --soname ${SONAME}" 1577 ewarn " revdep-rebuild --library ${SONAME}"
1508 einfo 1578 ewarn
1509 einfo "After doing that, you can safely remove ${LIB}" 1579 ewarn "After doing that, you can safely remove ${LIB}"
1510 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1580 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1511 fi 1581 fi
1512} 1582}
1513 1583
1514# Hack for people to figure out if a package was built with 1584# Hack for people to figure out if a package was built with
1515# certain USE flags 1585# certain USE flags
1523built_with_use() { 1593built_with_use() {
1524 local opt=$1 1594 local opt=$1
1525 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1595 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1526 1596
1527 local PKG=$(best_version $1) 1597 local PKG=$(best_version $1)
1598 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1528 shift 1599 shift
1529 1600
1530 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1601 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1531 [[ ! -e ${USEFILE} ]] && return 1 1602 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1603
1604 # if the USE file doesnt exist, assume the $PKG is either
1605 # injected or package.provided
1606 [[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with"
1607
1608 local IUSE_BUILT=$(<${IUSEFILE})
1609 # Don't check USE_EXPAND #147237
1610 local expand
1611 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1612 if [[ $1 == ${expand}_* ]] ; then
1613 expand=""
1614 break
1615 fi
1616 done
1617 if [[ -n ${expand} ]] ; then
1618 has $1 ${IUSE_BUILT} || die "$PKG does not actually support the $1 USE flag!"
1619 fi
1532 1620
1533 local USE_BUILT=$(<${USEFILE}) 1621 local USE_BUILT=$(<${USEFILE})
1534 while [[ $# -gt 0 ]] ; do 1622 while [[ $# -gt 0 ]] ; do
1535 if [[ ${opt} = "-o" ]] ; then 1623 if [[ ${opt} = "-o" ]] ; then
1536 has $1 ${USE_BUILT} && return 0 1624 has $1 ${USE_BUILT} && return 0
1588# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1676# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1589# $5 == path for wrapper 1677# $5 == path for wrapper
1590make_wrapper() { 1678make_wrapper() {
1591 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1679 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1592 local tmpwrapper=$(emktemp) 1680 local tmpwrapper=$(emktemp)
1681 # We don't want to quote ${bin} so that people can pass complex
1682 # things as $bin ... "./someprog --args"
1593 cat << EOF > "${tmpwrapper}" 1683 cat << EOF > "${tmpwrapper}"
1594#!/bin/sh 1684#!/bin/sh
1595cd "${chdir}" 1685cd "${chdir:-.}"
1686if [ -n "${libdir}" ] ; then
1687 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1596export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1688 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1689 else
1690 export LD_LIBRARY_PATH="${libdir}"
1691 fi
1692fi
1597exec ${bin} "\$@" 1693exec ${bin} "\$@"
1598EOF 1694EOF
1599 chmod go+rx "${tmpwrapper}" 1695 chmod go+rx "${tmpwrapper}"
1600 if [ -n "${5}" ] 1696 if [[ -n ${path} ]] ; then
1601 then
1602 exeinto ${5} 1697 exeinto "${path}"
1603 newexe "${tmpwrapper}" "${wrapper}" 1698 newexe "${tmpwrapper}" "${wrapper}"
1604 else 1699 else
1605 newbin "${tmpwrapper}" "${wrapper}" 1700 newbin "${tmpwrapper}" "${wrapper}"
1606 fi 1701 fi
1607} 1702}

Legend:
Removed from v.1.184  
changed lines
  Added in v.1.256

  ViewVC Help
Powered by ViewVC 1.1.20