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

Diff of /eclass/eutils.eclass

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

Revision 1.178 Revision 1.247
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.178 2005/05/26 22:09:26 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.247 2006/08/11 02:21:47 vapier 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() {
66 local libdir="$(get_libdir)" 60 local lib libdir=$(get_libdir)
67 # Just make sure it exists 61 # Just make sure it exists
68 dodir /usr/${libdir} 62 dodir /usr/${libdir}
69 63
70 for lib in "${@}" ; do 64 for lib in "${@}" ; do
71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 65 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
72 /* GNU ld script 66 /* GNU ld script
73 Since Gentoo has critical dynamic libraries 67 Since Gentoo has critical dynamic libraries
74 in /lib, and the static versions in /usr/lib, 68 in /lib, and the static versions in /usr/lib,
75 we need to have a "fake" dynamic lib in /usr/lib, 69 we need to have a "fake" dynamic lib in /usr/lib,
76 otherwise we run into linking problems. 70 otherwise we run into linking problems.
77 71
78 See bug http://bugs.gentoo.org/4411 for more info. 72 See bug http://bugs.gentoo.org/4411 for more info.
79 */ 73 */
80 GROUP ( /${libdir}/${lib} ) 74 GROUP ( /${libdir}/${lib} )
81 END_LDSCRIPT 75 END_LDSCRIPT
82 fperms a+x "/usr/${libdir}/${lib}" 76 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
83 done 77 done
84} 78}
85 79
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 80
117# Default directory where patches are located 81# Default directory where patches are located
118EPATCH_SOURCE="${WORKDIR}/patch" 82EPATCH_SOURCE="${WORKDIR}/patch"
119# Default extension for patches 83# Default extension for patches
120EPATCH_SUFFIX="patch.bz2" 84EPATCH_SUFFIX="patch.bz2"
121# Default options for patch 85# Default options for patch
122# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 86# 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. 87# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
88# Set -E to automatically remove empty files.
124EPATCH_OPTS="-g0 --no-backup-if-mismatch" 89EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
125# List of patches not to apply. Not this is only file names, 90# List of patches not to apply. Not this is only file names,
126# and not the full path .. 91# and not the full path ..
127EPATCH_EXCLUDE="" 92EPATCH_EXCLUDE=""
128# Change the printed message for a single patch. 93# Change the printed message for a single patch.
129EPATCH_SINGLE_MSG="" 94EPATCH_SINGLE_MSG=""
167# hand its a directory, it will set EPATCH_SOURCE to this. 132# hand its a directory, it will set EPATCH_SOURCE to this.
168# 133#
169# <azarah@gentoo.org> (10 Nov 2002) 134# <azarah@gentoo.org> (10 Nov 2002)
170# 135#
171epatch() { 136epatch() {
137 _epatch_draw_line() {
138 [[ -z $1 ]] && set "$(printf "%65s" '')"
139 echo "${1//?/=}"
140 }
141 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
172 local PIPE_CMD="" 142 local PIPE_CMD=""
173 local STDERR_TARGET="${T}/$$.out" 143 local STDERR_TARGET="${T}/$$.out"
174 local PATCH_TARGET="${T}/$$.patch" 144 local PATCH_TARGET="${T}/$$.patch"
175 local PATCH_SUFFIX="" 145 local PATCH_SUFFIX=""
176 local SINGLE_PATCH="no" 146 local SINGLE_PATCH="no"
177 local x="" 147 local x=""
148
149 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
178 150
179 if [ "$#" -gt 1 ] 151 if [ "$#" -gt 1 ]
180 then 152 then
181 local m="" 153 local m=""
182 for m in "$@" ; do 154 for m in "$@" ; do
283 255
284 # Allow for prefix to differ ... im lazy, so shoot me :/ 256 # Allow for prefix to differ ... im lazy, so shoot me :/
285 while [ "${count}" -lt 5 ] 257 while [ "${count}" -lt 5 ]
286 do 258 do
287 # Generate some useful debug info ... 259 # Generate some useful debug info ...
288 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 260 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
289 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 261 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290 262
291 if [ "${PATCH_SUFFIX}" != "patch" ] 263 if [ "${PATCH_SUFFIX}" != "patch" ]
292 then 264 then
293 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 265 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
298 270
299 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 271 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
300 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 272 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 273
302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 274 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
303 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 275 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
304 276
305 if [ "${PATCH_SUFFIX}" != "patch" ] 277 if [ "${PATCH_SUFFIX}" != "patch" ]
306 then 278 then
307 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 279 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
308 then 280 then
312 count=5 284 count=5
313 break 285 break
314 fi 286 fi
315 fi 287 fi
316 288
317 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 289 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
318 then 290 then
319 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 291 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 292 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 293 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 294 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 295 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 296
325 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 297 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
298 _epatch_assert
326 299
327 if [ "$?" -ne 0 ] 300 if [ "$?" -ne 0 ]
328 then 301 then
329 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 302 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
330 echo 303 echo
376# vapier@gentoo.org 349# vapier@gentoo.org
377# 350#
378# Takes just 1 optional parameter (the directory to create tmpfile in) 351# Takes just 1 optional parameter (the directory to create tmpfile in)
379emktemp() { 352emktemp() {
380 local exe="touch" 353 local exe="touch"
381 [ "$1" == "-d" ] && exe="mkdir" && shift 354 [[ $1 == -d ]] && exe="mkdir" && shift
382 local topdir="$1" 355 local topdir=$1
383 356
384 if [ -z "${topdir}" ] 357 if [[ -z ${topdir} ]] ; then
385 then
386 [ -z "${T}" ] \ 358 [[ -z ${T} ]] \
387 && topdir="/tmp" \ 359 && topdir="/tmp" \
388 || topdir="${T}" 360 || topdir=${T}
389 fi 361 fi
390 362
391 if [ -z "$(type -p mktemp)" ] 363 if [[ -z $(type -p mktemp) ]] ; then
392 then
393 local tmp=/ 364 local tmp=/
394 while [ -e "${tmp}" ] ; do 365 while [[ -e ${tmp} ]] ; do
395 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 366 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
396 done 367 done
397 ${exe} "${tmp}" 368 ${exe} "${tmp}" || ${exe} -p "${tmp}"
398 echo "${tmp}" 369 echo "${tmp}"
399 else 370 else
400 [ "${exe}" == "touch" ] \ 371 if [[ ${exe} == "touch" ]] ; then
401 && exe="-p" \ 372 [[ ${USERLAND} == "GNU" ]] \
402 || exe="-d" 373 && mktemp -p "${topdir}" \
403 mktemp ${exe} "${topdir}" 374 || TMPDIR="${topdir}" mktemp -t tmp
375 else
376 [[ ${USERLAND} == "GNU" ]] \
377 && mktemp -d "${topdir}" \
378 || TMPDIR="${topdir}" mktemp -dt tmp
379 fi
404 fi 380 fi
405} 381}
406 382
407# Small wrapper for getent (Linux), nidump (Mac OS X), 383# Small wrapper for getent (Linux), nidump (Mac OS X),
408# and pw (FreeBSD) used in enewuser()/enewgroup() 384# and pw (FreeBSD) used in enewuser()/enewgroup()
409# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 385# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
410# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 386# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
411# 387#
412# egetent(database, key) 388# egetent(database, key)
413egetent() { 389egetent() {
414 if useq ppc-macos ; then 390 case ${CHOST} in
391 *-darwin*)
415 case "$2" in 392 case "$2" in
416 *[!0-9]*) # Non numeric 393 *[!0-9]*) # Non numeric
417 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 394 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
418 ;; 395 ;;
419 *) # Numeric 396 *) # Numeric
420 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 397 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
421 ;; 398 ;;
422 esac 399 esac
423 elif useq x86-fbsd ; then 400 ;;
424 local action 401 *-freebsd*|*-dragonfly*)
425 if [ "$1" == "passwd" ] 402 local opts action="user"
426 then 403 [[ $1 == "passwd" ]] || action="group"
427 action="user" 404
428 else 405 # lookup by uid/gid
429 action="group" 406 if [[ $2 == [[:digit:]]* ]] ; then
407 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
430 fi 408 fi
409
431 pw show "${action}" "$2" -q 410 pw show ${action} ${opts} "$2" -q
432 else 411 ;;
412 *-netbsd*|*-openbsd*)
413 grep "$2:\*:" /etc/$1
414 ;;
415 *)
433 which nscd >& /dev/null && nscd -i "$1" 416 type -p nscd >& /dev/null && nscd -i "$1"
434 getent "$1" "$2" 417 getent "$1" "$2"
435 fi 418 ;;
419 esac
436} 420}
437 421
438# Simplify/standardize adding users to the system 422# Simplify/standardize adding users to the system
439# vapier@gentoo.org 423# vapier@gentoo.org
440# 424#
447# shell: /bin/false 431# shell: /bin/false
448# homedir: /dev/null 432# homedir: /dev/null
449# groups: none 433# groups: none
450# extra: comment of 'added by portage for ${PN}' 434# extra: comment of 'added by portage for ${PN}'
451enewuser() { 435enewuser() {
436 case ${EBUILD_PHASE} in
437 unpack|compile|test|install)
438 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
439 eerror "Package fails at QA and at life. Please file a bug."
440 die "Bad package! enewuser is only for use in pkg_* functions!"
441 esac
442
452 # get the username 443 # get the username
453 local euser="$1"; shift 444 local euser=$1; shift
454 if [ -z "${euser}" ] 445 if [[ -z ${euser} ]] ; then
455 then
456 eerror "No username specified !" 446 eerror "No username specified !"
457 die "Cannot call enewuser without a username" 447 die "Cannot call enewuser without a username"
458 fi 448 fi
459 449
460 # lets see if the username already exists 450 # lets see if the username already exists
461 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 451 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
462 then
463 return 0 452 return 0
464 fi 453 fi
465 einfo "Adding user '${euser}' to your system ..." 454 einfo "Adding user '${euser}' to your system ..."
466 455
467 # options to pass to useradd 456 # options to pass to useradd
468 local opts= 457 local opts=
469 458
470 # handle uid 459 # handle uid
471 local euid="$1"; shift 460 local euid=$1; shift
472 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 461 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
473 then
474 if [ "${euid}" -gt 0 ] 462 if [[ ${euid} -gt 0 ]] ; then
475 then
476 if [ ! -z "`egetent passwd ${euid}`" ] 463 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
477 then
478 euid="next" 464 euid="next"
479 fi 465 fi
480 else 466 else
481 eerror "Userid given but is not greater than 0 !" 467 eerror "Userid given but is not greater than 0 !"
482 die "${euid} is not a valid UID" 468 die "${euid} is not a valid UID"
483 fi 469 fi
484 else 470 else
485 euid="next" 471 euid="next"
486 fi 472 fi
487 if [ "${euid}" == "next" ] 473 if [[ ${euid} == "next" ]] ; then
488 then 474 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 475 [[ -z $(egetent passwd ${euid}) ]] && break
497 done 476 done
498 fi 477 fi
499 opts="${opts} -u ${euid}" 478 opts="${opts} -u ${euid}"
500 einfo " - Userid: ${euid}" 479 einfo " - Userid: ${euid}"
501 480
502 # handle shell 481 # handle shell
503 local eshell="$1"; shift 482 local eshell=$1; shift
504 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 483 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
505 then 484 if [[ ! -e ${ROOT}${eshell} ]] ; then
506 if [ ! -e "${eshell}" ]
507 then
508 eerror "A shell was specified but it does not exist !" 485 eerror "A shell was specified but it does not exist !"
509 die "${eshell} does not exist" 486 die "${eshell} does not exist in ${ROOT}"
487 fi
488 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
489 eerror "Do not specify ${eshell} yourself, use -1"
490 die "Pass '-1' as the shell parameter"
510 fi 491 fi
511 else 492 else
512 if [ "${USERLAND}" == "BSD" ] 493 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
513 then 494 [[ -x ${ROOT}${shell} ]] && break
514 eshell="/usr/bin/false" 495 done
515 else 496
516 eshell="/bin/false" 497 if [[ ${shell} == "/dev/null" ]] ; then
498 eerror "Unable to identify the shell to use"
499 die "Unable to identify the shell to use"
517 fi 500 fi
501
502 eshell=${shell}
518 fi 503 fi
519 einfo " - Shell: ${eshell}" 504 einfo " - Shell: ${eshell}"
520 opts="${opts} -s ${eshell}" 505 opts="${opts} -s ${eshell}"
521 506
522 # handle homedir 507 # handle homedir
523 local ehome="$1"; shift 508 local ehome=$1; shift
524 if [ -z "${ehome}" ] || [ "${eshell}" == "-1" ] 509 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
525 then
526 ehome="/dev/null" 510 ehome="/dev/null"
527 fi 511 fi
528 einfo " - Home: ${ehome}" 512 einfo " - Home: ${ehome}"
529 opts="${opts} -d ${ehome}" 513 opts="${opts} -d ${ehome}"
530 514
531 # handle groups 515 # handle groups
532 local egroups="$1"; shift 516 local egroups=$1; shift
533 if [ ! -z "${egroups}" ] 517 if [[ ! -z ${egroups} ]] ; then
534 then
535 local oldifs="${IFS}" 518 local oldifs=${IFS}
536 local defgroup="" exgroups="" 519 local defgroup="" exgroups=""
537 520
538 export IFS="," 521 export IFS=","
539 for g in ${egroups} 522 for g in ${egroups} ; do
540 do
541 export IFS="${oldifs}" 523 export IFS=${oldifs}
542 if [ -z "`egetent group \"${g}\"`" ] 524 if [[ -z $(egetent group "${g}") ]] ; then
543 then
544 eerror "You must add group ${g} to the system first" 525 eerror "You must add group ${g} to the system first"
545 die "${g} is not a valid GID" 526 die "${g} is not a valid GID"
546 fi 527 fi
547 if [ -z "${defgroup}" ] 528 if [[ -z ${defgroup} ]] ; then
548 then
549 defgroup="${g}" 529 defgroup=${g}
550 else 530 else
551 exgroups="${exgroups},${g}" 531 exgroups="${exgroups},${g}"
552 fi 532 fi
553 export IFS="," 533 export IFS=","
554 done 534 done
555 export IFS="${oldifs}" 535 export IFS=${oldifs}
556 536
557 opts="${opts} -g ${defgroup}" 537 opts="${opts} -g ${defgroup}"
558 if [ ! -z "${exgroups}" ] 538 if [[ ! -z ${exgroups} ]] ; then
559 then
560 opts="${opts} -G ${exgroups:1}" 539 opts="${opts} -G ${exgroups:1}"
561 fi 540 fi
562 else 541 else
563 egroups="(none)" 542 egroups="(none)"
564 fi 543 fi
565 einfo " - Groups: ${egroups}" 544 einfo " - Groups: ${egroups}"
566 545
567 # handle extra and add the user 546 # handle extra and add the user
568 local eextra="$@"
569 local oldsandbox="${SANDBOX_ON}" 547 local oldsandbox=${SANDBOX_ON}
570 export SANDBOX_ON="0" 548 export SANDBOX_ON="0"
571 if useq ppc-macos 549 case ${CHOST} in
572 then 550 *-darwin*)
573 ### Make the user 551 ### Make the user
574 if [ -z "${eextra}" ] 552 if [[ -z $@ ]] ; then
575 then
576 dscl . create /users/${euser} uid ${euid} 553 dscl . create /users/${euser} uid ${euid}
577 dscl . create /users/${euser} shell ${eshell} 554 dscl . create /users/${euser} shell ${eshell}
578 dscl . create /users/${euser} home ${ehome} 555 dscl . create /users/${euser} home ${ehome}
579 dscl . create /users/${euser} realname "added by portage for ${PN}" 556 dscl . create /users/${euser} realname "added by portage for ${PN}"
580 ### Add the user to the groups specified 557 ### Add the user to the groups specified
581 local oldifs="${IFS}" 558 local oldifs=${IFS}
582 export IFS="," 559 export IFS=","
583 for g in ${egroups} 560 for g in ${egroups} ; do
584 do
585 dscl . merge /groups/${g} users ${euser} 561 dscl . merge /groups/${g} users ${euser}
586 done 562 done
587 export IFS="${oldifs}" 563 export IFS=${oldifs}
588 else 564 else
589 einfo "Extra options are not supported on macos yet" 565 einfo "Extra options are not supported on Darwin yet"
590 einfo "Please report the ebuild along with the info below" 566 einfo "Please report the ebuild along with the info below"
591 einfo "eextra: ${eextra}" 567 einfo "eextra: $@"
592 die "Required function missing" 568 die "Required function missing"
593 fi 569 fi
594 elif use x86-fbsd ; then 570 ;;
595 if [ -z "${eextra}" ] 571 *-freebsd*|*-dragonfly*)
596 then 572 if [[ -z $@ ]] ; then
597 pw useradd ${euser} ${opts} \ 573 pw useradd ${euser} ${opts} \
598 -c "added by portage for ${PN}" \ 574 -c "added by portage for ${PN}" \
599 die "enewuser failed" 575 die "enewuser failed"
600 else 576 else
601 einfo " - Extra: ${eextra}" 577 einfo " - Extra: $@"
602 pw useradd ${euser} ${opts} \ 578 pw useradd ${euser} ${opts} \
603 -c ${eextra} || die "enewuser failed" 579 "$@" || die "enewuser failed"
604 fi 580 fi
581 ;;
582
583 *-netbsd*)
584 if [[ -z $@ ]] ; then
585 useradd ${opts} ${euser} || die "enewuser failed"
605 else 586 else
606 if [ -z "${eextra}" ] 587 einfo " - Extra: $@"
607 then 588 useradd ${opts} ${euser} "$@" || die "enewuser failed"
589 fi
590 ;;
591
592 *-openbsd*)
593 if [[ -z $@ ]] ; then
594 useradd -u ${euid} -s ${eshell} \
595 -d ${ehome} -c "Added by portage for ${PN}" \
596 -g ${egroups} ${euser} || die "enewuser failed"
597 else
598 einfo " - Extra: $@"
599 useradd -u ${euid} -s ${eshell} \
600 -d ${ehome} -c "Added by portage for ${PN}" \
601 -g ${egroups} ${euser} "$@" || die "enewuser failed"
602 fi
603 ;;
604
605 *)
606 if [[ -z $@ ]] ; then
608 useradd ${opts} ${euser} \ 607 useradd ${opts} ${euser} \
609 -c "added by portage for ${PN}" \ 608 -c "added by portage for ${PN}" \
610 || die "enewuser failed" 609 || die "enewuser failed"
611 else 610 else
612 einfo " - Extra: ${eextra}" 611 einfo " - Extra: $@"
613 useradd ${opts} ${euser} ${eextra} \ 612 useradd ${opts} ${euser} "$@" \
614 || die "enewuser failed" 613 || die "enewuser failed"
615 fi 614 fi
615 ;;
616 esac
617
618 if [[ ! -e ${ROOT}/${ehome} ]] ; then
619 einfo " - Creating ${ehome} in ${ROOT}"
620 mkdir -p "${ROOT}/${ehome}"
621 chown ${euser} "${ROOT}/${ehome}"
622 chmod 755 "${ROOT}/${ehome}"
616 fi 623 fi
624
617 export SANDBOX_ON="${oldsandbox}" 625 export SANDBOX_ON=${oldsandbox}
618
619 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
620 then
621 einfo " - Creating ${ehome} in ${D}"
622 dodir ${ehome}
623 fowners ${euser} ${ehome}
624 fperms 755 ${ehome}
625 fi
626} 626}
627 627
628# Simplify/standardize adding groups to the system 628# Simplify/standardize adding groups to the system
629# vapier@gentoo.org 629# vapier@gentoo.org
630# 630#
633# Default values if you do not specify any: 633# Default values if you do not specify any:
634# groupname: REQUIRED ! 634# groupname: REQUIRED !
635# gid: next available (see groupadd(8)) 635# gid: next available (see groupadd(8))
636# extra: none 636# extra: none
637enewgroup() { 637enewgroup() {
638 case ${EBUILD_PHASE} in
639 unpack|compile|test|install)
640 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
641 eerror "Package fails at QA and at life. Please file a bug."
642 die "Bad package! enewgroup is only for use in pkg_* functions!"
643 esac
644
638 # get the group 645 # get the group
639 local egroup="$1"; shift 646 local egroup="$1"; shift
640 if [ -z "${egroup}" ] 647 if [ -z "${egroup}" ]
641 then 648 then
642 eerror "No group specified !" 649 eerror "No group specified !"
659 then 666 then
660 if [ "${egid}" -gt 0 ] 667 if [ "${egid}" -gt 0 ]
661 then 668 then
662 if [ -z "`egetent group ${egid}`" ] 669 if [ -z "`egetent group ${egid}`" ]
663 then 670 then
664 if useq ppc-macos ; then 671 if [[ "${CHOST}" == *-darwin* ]]; then
665 opts="${opts} ${egid}" 672 opts="${opts} ${egid}"
666 else 673 else
667 opts="${opts} -g ${egid}" 674 opts="${opts} -g ${egid}"
668 fi 675 fi
669 else 676 else
683 opts="${opts} ${eextra}" 690 opts="${opts} ${eextra}"
684 691
685 # add the group 692 # add the group
686 local oldsandbox="${SANDBOX_ON}" 693 local oldsandbox="${SANDBOX_ON}"
687 export SANDBOX_ON="0" 694 export SANDBOX_ON="0"
688 if useq ppc-macos ; then 695 case ${CHOST} in
696 *-darwin*)
689 if [ ! -z "${eextra}" ]; 697 if [ ! -z "${eextra}" ];
690 then 698 then
691 einfo "Extra options are not supported on macos yet" 699 einfo "Extra options are not supported on Darwin/OS X yet"
692 einfo "Please report the ebuild along with the info below" 700 einfo "Please report the ebuild along with the info below"
693 einfo "eextra: ${eextra}" 701 einfo "eextra: ${eextra}"
694 die "Required function missing" 702 die "Required function missing"
695 fi 703 fi
696 704
697 # If we need the next available 705 # If we need the next available
698 case ${egid} in 706 case ${egid} in
699 *[!0-9]*) # Non numeric 707 *[!0-9]*) # Non numeric
700 for egid in `jot 898 101`; do 708 for egid in $(seq 101 999); do
701 [ -z "`egetent group ${egid}`" ] && break 709 [ -z "`egetent group ${egid}`" ] && break
702 done 710 done
703 esac 711 esac
704 dscl . create /groups/${egroup} gid ${egid} 712 dscl . create /groups/${egroup} gid ${egid}
705 dscl . create /groups/${egroup} passwd '*' 713 dscl . create /groups/${egroup} passwd '*'
706 elif use x86-fbsd ; then 714 ;;
715
716 *-freebsd*|*-dragonfly*)
707 case ${egid} in 717 case ${egid} in
708 *[!0-9]*) # Non numeric 718 *[!0-9]*) # Non numeric
709 for egid in `jot 898 101`; do 719 for egid in $(seq 101 999); do
710 [ -z "`egetent group ${egid}`" ] && break 720 [ -z "`egetent group ${egid}`" ] && break
711 done 721 done
712 esac 722 esac
713 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 723 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
714 else 724 ;;
725
726 *-netbsd*)
727 case ${egid} in
728 *[!0-9]*) # Non numeric
729 for egid in $(seq 101 999); do
730 [ -z "`egetent group ${egid}`" ] && break
731 done
732 esac
733 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
734 ;;
735
736 *)
715 groupadd ${opts} ${egroup} || die "enewgroup failed" 737 groupadd ${opts} ${egroup} || die "enewgroup failed"
716 fi 738 ;;
739 esac
717 export SANDBOX_ON="${oldsandbox}" 740 export SANDBOX_ON="${oldsandbox}"
718} 741}
719 742
720# Simple script to replace 'dos2unix' binaries 743# Simple script to replace 'dos2unix' binaries
721# vapier@gentoo.org 744# vapier@gentoo.org
738 761
739# Make a desktop file ! 762# Make a desktop file !
740# Great for making those icons in kde/gnome startmenu ! 763# Great for making those icons in kde/gnome startmenu !
741# Amaze your friends ! Get the women ! Join today ! 764# Amaze your friends ! Get the women ! Join today !
742# 765#
743# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 766# make_desktop_entry(<command>, [name], [icon], [type], [path])
744# 767#
745# binary: what binary does the app run with ? 768# binary: what command does the app run with ?
746# name: the name that will show up in the menu 769# name: the name that will show up in the menu
747# icon: give your little like a pretty little icon ... 770# icon: give your little like a pretty little icon ...
748# this can be relative (to /usr/share/pixmaps) or 771# this can be relative (to /usr/share/pixmaps) or
749# a full path to an icon 772# a full path to an icon
750# type: what kind of application is this ? for categories: 773# type: what kind of application is this ? for categories:
751# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 774# http://www.freedesktop.org/Standards/desktop-entry-spec
752# path: if your app needs to startup in a specific dir 775# path: if your app needs to startup in a specific dir
753make_desktop_entry() { 776make_desktop_entry() {
754 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 777 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
755 778
756 local exec=${1} 779 local exec=${1}
782 dev) 805 dev)
783 type="Development" 806 type="Development"
784 ;; 807 ;;
785 808
786 games) 809 games)
787 [[ -z ${path} ]] && path=${GAMES_BINDIR}
788
789 case ${catmin} in 810 case ${catmin} in
790 action) type=ActionGame;; 811 action) type=ActionGame;;
791 arcade) type=ArcadeGame;; 812 arcade) type=ArcadeGame;;
792 board) type=BoardGame;; 813 board) type=BoardGame;;
793 kid) type=KidsGame;; 814 kid) type=KidsGame;;
834 type="Network;${type}" 855 type="Network;${type}"
835 ;; 856 ;;
836 857
837 sci) 858 sci)
838 case ${catmin} in 859 case ${catmin} in
839 astro*) type=Astronomoy;; 860 astro*) type=Astronomy;;
840 bio*) type=Biology;; 861 bio*) type=Biology;;
841 calc*) type=Calculator;; 862 calc*) type=Calculator;;
842 chem*) type=Chemistry;; 863 chem*) type=Chemistry;;
843 geo*) type=Geology;; 864 geo*) type=Geology;;
844 math*) type=Math;; 865 math*) type=Math;;
864 local desktop_name="${PN}" 885 local desktop_name="${PN}"
865 else 886 else
866 local desktop_name="${PN}-${SLOT}" 887 local desktop_name="${PN}-${SLOT}"
867 fi 888 fi
868 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 889 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
890# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
869 891
870echo "[Desktop Entry] 892echo "[Desktop Entry]
871Encoding=UTF-8 893Encoding=UTF-8
872Version=0.9.2 894Version=0.9.2
873Name=${name} 895Name=${name}
874Type=Application 896Type=Application
875Comment=${DESCRIPTION} 897Comment=${DESCRIPTION}
876Exec=${exec} 898Exec=${exec}
899TryExec=${exec%% *}
877Path=${path} 900Path=${path}
878Icon=${icon} 901Icon=${icon}
879Categories=Application;${type};" > "${desktop}" 902Categories=Application;${type};" > "${desktop}"
880 903
904 (
905 # wrap the env here so that the 'insinto' call
906 # doesn't corrupt the env of the caller
881 insinto /usr/share/applications 907 insinto /usr/share/applications
882 doins "${desktop}" 908 doins "${desktop}"
883 909 )
884 return 0
885} 910}
886 911
887# Make a GDM/KDM Session file 912# Make a GDM/KDM Session file
888# 913#
889# make_desktop_entry(<title>, <command>) 914# make_desktop_entry(<title>, <command>)
918 doins "${i}" 943 doins "${i}"
919 elif [[ -d ${i} ]] ; then 944 elif [[ -d ${i} ]] ; then
920 for j in "${i}"/*.desktop ; do 945 for j in "${i}"/*.desktop ; do
921 doins "${j}" 946 doins "${j}"
922 done 947 done
923 fi 948 fi
924 done 949 done
925} 950}
926newmenu() { 951newmenu() {
927 insinto /usr/share/applications 952 insinto /usr/share/applications
928 newins "$1" "$2" 953 newins "$1" "$2"
936 doins "${i}" 961 doins "${i}"
937 elif [[ -d ${i} ]] ; then 962 elif [[ -d ${i} ]] ; then
938 for j in "${i}"/*.png ; do 963 for j in "${i}"/*.png ; do
939 doins "${j}" 964 doins "${j}"
940 done 965 done
941 fi 966 fi
942 done 967 done
943} 968}
944newicon() { 969newicon() {
945 insinto /usr/share/pixmaps 970 insinto /usr/share/pixmaps
946 newins "$1" "$2" 971 newins "$1" "$2"
951############################################################## 976##############################################################
952 977
953 978
954# for internal use only (unpack_pdv and unpack_makeself) 979# for internal use only (unpack_pdv and unpack_makeself)
955find_unpackable_file() { 980find_unpackable_file() {
956 local src="$1" 981 local src=$1
957 if [ -z "${src}" ] 982 if [[ -z ${src} ]] ; then
958 then
959 src="${DISTDIR}/${A}" 983 src=${DISTDIR}/${A}
960 else 984 else
961 if [ -e "${DISTDIR}/${src}" ] 985 if [[ -e ${DISTDIR}/${src} ]] ; then
962 then
963 src="${DISTDIR}/${src}" 986 src=${DISTDIR}/${src}
964 elif [ -e "${PWD}/${src}" ] 987 elif [[ -e ${PWD}/${src} ]] ; then
965 then
966 src="${PWD}/${src}" 988 src=${PWD}/${src}
967 elif [ -e "${src}" ] 989 elif [[ -e ${src} ]] ; then
968 then
969 src="${src}" 990 src=${src}
970 fi
971 fi 991 fi
972 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 992 fi
993 [[ ! -e ${src} ]] && return 1
973 echo "${src}" 994 echo "${src}"
974} 995}
975 996
976# Unpack those pesky pdv generated files ... 997# Unpack those pesky pdv generated files ...
977# They're self-unpacking programs with the binary package stuffed in 998# They're self-unpacking programs with the binary package stuffed in
992# lseek 1013# lseek
993# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1014# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
994# lseek(3, -4, SEEK_END) = 2981250 1015# lseek(3, -4, SEEK_END) = 2981250
995# thus we would pass in the value of '4' as the second parameter. 1016# thus we would pass in the value of '4' as the second parameter.
996unpack_pdv() { 1017unpack_pdv() {
997 local src="`find_unpackable_file $1`" 1018 local src=$(find_unpackable_file $1)
998 local sizeoff_t="$2" 1019 local sizeoff_t=$2
999 1020
1021 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1000 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1022 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1001 1023
1002 local shrtsrc="`basename ${src}`" 1024 local shrtsrc=$(basename "${src}")
1003 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1025 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1004 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1026 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1005 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1027 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1006 1028
1007 # grab metadata for debug reasons 1029 # grab metadata for debug reasons
1071# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1093# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1072# - If the file is not specified then unpack will utilize ${A}. 1094# - If the file is not specified then unpack will utilize ${A}.
1073# - If the offset is not specified then we will attempt to extract 1095# - If the offset is not specified then we will attempt to extract
1074# the proper offset from the script itself. 1096# the proper offset from the script itself.
1075unpack_makeself() { 1097unpack_makeself() {
1098 local src_input=${1:-${A}}
1076 local src="$(find_unpackable_file "$1")" 1099 local src=$(find_unpackable_file "${src_input}")
1077 local skip="$2" 1100 local skip=$2
1078 local exe="$3" 1101 local exe=$3
1079 1102
1103 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1104
1080 local shrtsrc="$(basename "${src}")" 1105 local shrtsrc=$(basename "${src}")
1081 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1106 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1082 if [ -z "${skip}" ] 1107 if [[ -z ${skip} ]] ; then
1083 then
1084 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1108 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1085 local skip=0 1109 local skip=0
1086 exe=tail 1110 exe=tail
1087 case ${ver} in 1111 case ${ver} in
1088 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1112 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1089 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1113 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1090 ;; 1114 ;;
1091 2.0|2.0.1) 1115 2.0|2.0.1)
1092 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1116 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1093 ;; 1117 ;;
1101 ;; 1125 ;;
1102 2.1.3) 1126 2.1.3)
1103 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1127 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1104 let skip="skip + 1" 1128 let skip="skip + 1"
1105 ;; 1129 ;;
1106 2.1.4) 1130 2.1.4|2.1.5)
1107 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1131 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1108 skip=$(head -n ${skip} "${src}" | wc -c) 1132 skip=$(head -n ${skip} "${src}" | wc -c)
1109 exe="dd" 1133 exe="dd"
1110 ;; 1134 ;;
1111 *) 1135 *)
1156check_license() { 1180check_license() {
1157 local lic=$1 1181 local lic=$1
1158 if [ -z "${lic}" ] ; then 1182 if [ -z "${lic}" ] ; then
1159 lic="${PORTDIR}/licenses/${LICENSE}" 1183 lic="${PORTDIR}/licenses/${LICENSE}"
1160 else 1184 else
1161 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1185 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1162 lic="${PORTDIR}/licenses/${src}" 1186 lic="${PORTDIR}/licenses/${lic}"
1163 elif [ -e "${PWD}/${src}" ] ; then 1187 elif [ -e "${PWD}/${lic}" ] ; then
1164 lic="${PWD}/${src}" 1188 lic="${PWD}/${lic}"
1165 elif [ -e "${src}" ] ; then 1189 elif [ -e "${lic}" ] ; then
1166 lic="${src}" 1190 lic="${lic}"
1167 fi
1168 fi 1191 fi
1192 fi
1169 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1193 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1170 local l="`basename ${lic}`" 1194 local l="`basename ${lic}`"
1171 1195
1172 # here is where we check for the licenses the user already 1196 # here is where we check for the licenses the user already
1173 # accepted ... if we don't find a match, we make the user accept 1197 # accepted ... if we don't find a match, we make the user accept
1174 local shopts=$- 1198 local shopts=$-
1216# and when the function returns, you can assume that the cd has been 1240# and when the function returns, you can assume that the cd has been
1217# found at CDROM_ROOT. 1241# found at CDROM_ROOT.
1218# 1242#
1219# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1243# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1220# etc... if you want to give the cds better names, then just export 1244# etc... if you want to give the cds better names, then just export
1221# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1245# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1246# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1247# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1248# CDROM_NAME_2="data cd"
1249# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1222# 1250#
1223# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1251# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1224# 1252#
1225# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1253# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1226# - this will attempt to locate a cd based upon a file that is on 1254# - this will attempt to locate a cd based upon a file that is on
1230 # first we figure out how many cds we're dealing with by 1258 # first we figure out how many cds we're dealing with by
1231 # the # of files they gave us 1259 # the # of files they gave us
1232 local cdcnt=0 1260 local cdcnt=0
1233 local f= 1261 local f=
1234 for f in "$@" ; do 1262 for f in "$@" ; do
1235 cdcnt=$((cdcnt + 1)) 1263 ((++cdcnt))
1236 export CDROM_CHECK_${cdcnt}="$f" 1264 export CDROM_CHECK_${cdcnt}="$f"
1237 done 1265 done
1238 export CDROM_TOTAL_CDS=${cdcnt} 1266 export CDROM_TOTAL_CDS=${cdcnt}
1239 export CDROM_CURRENT_CD=1 1267 export CDROM_CURRENT_CD=1
1240 1268
1241 # now we see if the user gave use CD_ROOT ... 1269 # now we see if the user gave use CD_ROOT ...
1242 # if they did, let's just believe them that it's correct 1270 # if they did, let's just believe them that it's correct
1243 if [[ ! -z ${CD_ROOT} ]] ; then
1244 export CDROM_ROOT=${CD_ROOT}
1245 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1246 return
1247 fi
1248 # do the same for CD_ROOT_X
1249 if [[ ! -z ${CD_ROOT_1} ]] ; then 1271 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1250 local var= 1272 local var=
1251 cdcnt=0 1273 cdcnt=0
1252 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1274 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1253 cdcnt=$((cdcnt + 1)) 1275 ((++cdcnt))
1254 var="CD_ROOT_${cdcnt}" 1276 var="CD_ROOT_${cdcnt}"
1277 [[ -z ${!var} ]] && var="CD_ROOT"
1255 if [[ -z ${!var} ]] ; then 1278 if [[ -z ${!var} ]] ; then
1256 eerror "You must either use just the CD_ROOT" 1279 eerror "You must either use just the CD_ROOT"
1257 eerror "or specify ALL the CD_ROOT_X variables." 1280 eerror "or specify ALL the CD_ROOT_X variables."
1258 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1281 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1259 die "could not locate CD_ROOT_${cdcnt}" 1282 die "could not locate CD_ROOT_${cdcnt}"
1260 fi 1283 fi
1261 export CDROM_ROOTS_${cdcnt}="${!var}"
1262 done 1284 done
1263 export CDROM_ROOT=${CDROM_ROOTS_1} 1285 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1264 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1286 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1287 export CDROM_SET=-1
1288 for f in ${CDROM_CHECK_1//:/ } ; do
1289 ((++CDROM_SET))
1290 [[ -e ${CD_ROOT}/${f} ]] && break
1291 done
1292 export CDROM_MATCH=${f}
1265 return 1293 return
1266 fi 1294 fi
1267 1295
1296 # User didn't help us out so lets make sure they know they can
1297 # simplify the whole process ...
1268 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1298 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1269 einfon "This ebuild will need the " 1299 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1270 if [[ -z ${CDROM_NAME} ]] ; then
1271 echo "cdrom for ${PN}."
1272 else
1273 echo "${CDROM_NAME}."
1274 fi
1275 echo 1300 echo
1276 einfo "If you do not have the CD, but have the data files" 1301 einfo "If you do not have the CD, but have the data files"
1277 einfo "mounted somewhere on your filesystem, just export" 1302 einfo "mounted somewhere on your filesystem, just export"
1278 einfo "the variable CD_ROOT so that it points to the" 1303 einfo "the variable CD_ROOT so that it points to the"
1279 einfo "directory containing the files." 1304 einfo "directory containing the files."
1280 echo 1305 echo
1281 einfo "For example:" 1306 einfo "For example:"
1282 einfo "export CD_ROOT=/mnt/cdrom" 1307 einfo "export CD_ROOT=/mnt/cdrom"
1283 echo 1308 echo
1284 else 1309 else
1310 if [[ -n ${CDROM_NAME_SET} ]] ; then
1311 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1312 cdcnt=0
1313 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1314 ((++cdcnt))
1315 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1316 done
1317 fi
1318
1285 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1319 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1286 cdcnt=0 1320 cdcnt=0
1287 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1288 cdcnt=$((cdcnt + 1)) 1322 ((++cdcnt))
1289 var="CDROM_NAME_${cdcnt}" 1323 var="CDROM_NAME_${cdcnt}"
1290 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1324 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1291 done 1325 done
1292 echo 1326 echo
1293 einfo "If you do not have the CDs, but have the data files" 1327 einfo "If you do not have the CDs, but have the data files"
1294 einfo "mounted somewhere on your filesystem, just export" 1328 einfo "mounted somewhere on your filesystem, just export"
1295 einfo "the following variables so they point to the right place:" 1329 einfo "the following variables so they point to the right place:"
1296 einfon "" 1330 einfon ""
1297 cdcnt=0 1331 cdcnt=0
1298 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1332 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1299 cdcnt=$((cdcnt + 1)) 1333 ((++cdcnt))
1300 echo -n " CD_ROOT_${cdcnt}" 1334 echo -n " CD_ROOT_${cdcnt}"
1301 done 1335 done
1302 echo 1336 echo
1303 einfo "Or, if you have all the files in the same place, or" 1337 einfo "Or, if you have all the files in the same place, or"
1304 einfo "you only have one cdrom, you can export CD_ROOT" 1338 einfo "you only have one cdrom, you can export CD_ROOT"
1307 echo 1341 echo
1308 einfo "For example:" 1342 einfo "For example:"
1309 einfo "export CD_ROOT_1=/mnt/cdrom" 1343 einfo "export CD_ROOT_1=/mnt/cdrom"
1310 echo 1344 echo
1311 fi 1345 fi
1346
1347 export CDROM_SET=""
1312 export CDROM_CURRENT_CD=0 1348 export CDROM_CURRENT_CD=0
1313 cdrom_load_next_cd 1349 cdrom_load_next_cd
1314} 1350}
1315 1351
1316# this is only used when you need access to more than one cd. 1352# this is only used when you need access to more than one cd.
1317# when you have finished using the first cd, just call this function. 1353# when you have finished using the first cd, just call this function.
1318# when it returns, CDROM_ROOT will be pointing to the second cd. 1354# when it returns, CDROM_ROOT will be pointing to the second cd.
1319# remember, you can only go forward in the cd chain, you can't go back. 1355# remember, you can only go forward in the cd chain, you can't go back.
1320cdrom_load_next_cd() { 1356cdrom_load_next_cd() {
1321 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1322 local var= 1357 local var
1323 1358 ((++CDROM_CURRENT_CD))
1324 if [[ ! -z ${CD_ROOT} ]] ; then
1325 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1326 return
1327 fi
1328 1359
1329 unset CDROM_ROOT 1360 unset CDROM_ROOT
1330 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1361 var=CD_ROOT_${CDROM_CURRENT_CD}
1362 [[ -z ${!var} ]] && var="CD_ROOT"
1331 if [[ -z ${!var} ]] ; then 1363 if [[ -z ${!var} ]] ; then
1332 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1364 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1333 cdrom_locate_file_on_cd ${!var} 1365 _cdrom_locate_file_on_cd ${!var}
1334 else 1366 else
1335 export CDROM_ROOT=${!var} 1367 export CDROM_ROOT=${!var}
1336 fi 1368 fi
1337 1369
1338 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1370 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1343# all it does is try to locate a give file on a cd ... if the cd isn't 1375# all it does is try to locate a give file on a cd ... if the cd isn't
1344# found, then a message asking for the user to insert the cdrom will be 1376# found, then a message asking for the user to insert the cdrom will be
1345# displayed and we'll hang out here until: 1377# displayed and we'll hang out here until:
1346# (1) the file is found on a mounted cdrom 1378# (1) the file is found on a mounted cdrom
1347# (2) the user hits CTRL+C 1379# (2) the user hits CTRL+C
1348cdrom_locate_file_on_cd() { 1380_cdrom_locate_file_on_cd() {
1381 local mline=""
1382 local showedmsg=0
1383
1349 while [[ -z ${CDROM_ROOT} ]] ; do 1384 while [[ -z ${CDROM_ROOT} ]] ; do
1385 local i=0
1386 local -a cdset=(${*//:/ })
1387 if [[ -n ${CDROM_SET} ]] ; then
1388 cdset=(${cdset[${CDROM_SET}]})
1389 fi
1390
1391 while [[ -n ${cdset[${i}]} ]] ; do
1350 local dir="$(dirname ${@})" 1392 local dir=$(dirname ${cdset[${i}]})
1351 local file="$(basename ${@})" 1393 local file=$(basename ${cdset[${i}]})
1352 local mline=""
1353 local showedmsg=0
1354 1394
1355 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1395 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1356 [[ -d ${mline}/${dir} ]] || continue 1396 [[ -d ${mline}/${dir} ]] || continue
1357 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1397 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1358 && export CDROM_ROOT=${mline} 1398 export CDROM_ROOT=${mline}
1399 export CDROM_SET=${i}
1400 export CDROM_MATCH=${cdset[${i}]}
1401 return
1402 fi
1403 done
1404
1405 ((++i))
1359 done 1406 done
1360 1407
1361 if [[ -z ${CDROM_ROOT} ]] ; then
1362 echo 1408 echo
1363 if [[ ${showedmsg} -eq 0 ]] ; then 1409 if [[ ${showedmsg} -eq 0 ]] ; then
1364 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1410 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1365 if [[ -z ${CDROM_NAME} ]] ; then 1411 if [[ -z ${CDROM_NAME} ]] ; then
1366 einfo "Please insert the cdrom for ${PN} now !" 1412 einfo "Please insert+mount the cdrom for ${PN} now !"
1367 else
1368 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1369 fi
1370 else 1413 else
1371 if [[ -z ${CDROM_NAME_1} ]] ; then
1372 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1373 else
1374 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1375 einfo "Please insert+mount the ${!var} cdrom now !" 1414 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1376 fi
1377 fi 1415 fi
1378 showedmsg=1 1416 else
1417 if [[ -z ${CDROM_NAME_1} ]] ; then
1418 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1419 else
1420 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1421 einfo "Please insert+mount the ${!var} cdrom now !"
1422 fi
1379 fi 1423 fi
1424 showedmsg=1
1425 fi
1380 einfo "Press return to scan for the cd again" 1426 einfo "Press return to scan for the cd again"
1381 einfo "or hit CTRL+C to abort the emerge." 1427 einfo "or hit CTRL+C to abort the emerge."
1382 read 1428 echo
1383 fi 1429 einfo "If you are having trouble with the detection"
1430 einfo "of your CD, it is possible that you do not have"
1431 einfo "Joliet support enabled in your kernel. Please"
1432 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1433 read || die "something is screwed with your system"
1384 done 1434 done
1385} 1435}
1386 1436
1387# Make sure that LINGUAS only contains languages that 1437# Make sure that LINGUAS only contains languages that
1388# a package can support 1438# a package can support
1395# The -i builds a list of po files found in all the 1445# The -i builds a list of po files found in all the
1396# directories and uses the intersection of the lists. 1446# directories and uses the intersection of the lists.
1397# The -u builds a list of po files found in all the 1447# The -u builds a list of po files found in all the
1398# directories and uses the union of the lists. 1448# directories and uses the union of the lists.
1399strip-linguas() { 1449strip-linguas() {
1400 local ls newls 1450 local ls newls nols
1401 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1451 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1402 local op=$1; shift 1452 local op=$1; shift
1403 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1453 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1404 local d f 1454 local d f
1405 for d in "$@" ; do 1455 for d in "$@" ; do
1406 if [[ ${op} == "-u" ]] ; then 1456 if [[ ${op} == "-u" ]] ; then
1407 newls=${ls} 1457 newls=${ls}
1408 else 1458 else
1409 newls="" 1459 newls=""
1410 fi 1460 fi
1411 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1461 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1412 if [[ ${op} == "-i" ]] ; then 1462 if [[ ${op} == "-i" ]] ; then
1413 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1463 hasq ${f} ${ls} && newls="${newls} ${f}"
1414 else 1464 else
1415 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1465 hasq ${f} ${ls} || newls="${newls} ${f}"
1416 fi 1466 fi
1417 done 1467 done
1418 ls=${newls} 1468 ls=${newls}
1419 done 1469 done
1420 ls=${ls//.po}
1421 else 1470 else
1422 ls=$@ 1471 ls="$@"
1423 fi 1472 fi
1424 1473
1425 ls=" ${ls} " 1474 nols=""
1426 newls="" 1475 newls=""
1427 for f in ${LINGUAS} ; do 1476 for f in ${LINGUAS} ; do
1428 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1477 if hasq ${f} ${ls} ; then
1429 newls="${newls} ${f}" 1478 newls="${newls} ${f}"
1430 else 1479 else
1431 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1480 nols="${nols} ${f}"
1432 fi 1481 fi
1433 done 1482 done
1434 if [[ -z ${newls} ]] ; then 1483 [[ -n ${nols} ]] \
1435 export LINGUAS="" 1484 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1436 else
1437 export LINGUAS=${newls:1} 1485 export LINGUAS=${newls:1}
1438 fi
1439} 1486}
1440 1487
1441# moved from kernel.eclass since they are generally useful outside of 1488# moved from kernel.eclass since they are generally useful outside of
1442# kernel.eclass -iggy (20041002) 1489# kernel.eclass -iggy (20041002)
1443 1490
1472 1519
1473# Jeremy Huddleston <eradicator@gentoo.org>: 1520# Jeremy Huddleston <eradicator@gentoo.org>:
1474# preserve_old_lib /path/to/libblah.so.0 1521# preserve_old_lib /path/to/libblah.so.0
1475# preserve_old_lib_notify /path/to/libblah.so.0 1522# preserve_old_lib_notify /path/to/libblah.so.0
1476# 1523#
1477# These functions are useful when a lib in your package changes --soname. Such 1524# These functions are useful when a lib in your package changes --library. Such
1478# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1525# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1479# would break packages that link against it. Most people get around this 1526# would break packages that link against it. Most people get around this
1480# by using the portage SLOT mechanism, but that is not always a relevant 1527# by using the portage SLOT mechanism, but that is not always a relevant
1481# solution, so instead you can add the following to your ebuilds: 1528# solution, so instead you can add the following to your ebuilds:
1482# 1529#
1509 LIB=$1 1556 LIB=$1
1510 1557
1511 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1558 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1512 SONAME=`basename ${LIB}` 1559 SONAME=`basename ${LIB}`
1513 1560
1514 einfo "An old version of an installed library was detected on your system." 1561 ewarn "An old version of an installed library was detected on your system."
1515 einfo "In order to avoid breaking packages that link against is, this older version" 1562 ewarn "In order to avoid breaking packages that link against it, this older version"
1516 einfo "is not being removed. In order to make full use of this newer version," 1563 ewarn "is not being removed. In order to make full use of this newer version,"
1517 einfo "you will need to execute the following command:" 1564 ewarn "you will need to execute the following command:"
1518 einfo " revdep-rebuild --soname ${SONAME}" 1565 ewarn " revdep-rebuild --library ${SONAME}"
1519 einfo 1566 ewarn
1520 einfo "After doing that, you can safely remove ${LIB}" 1567 ewarn "After doing that, you can safely remove ${LIB}"
1521 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1568 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1522 fi 1569 fi
1523} 1570}
1524 1571
1525# Hack for people to figure out if a package was built with 1572# Hack for people to figure out if a package was built with
1526# certain USE flags 1573# certain USE flags
1534built_with_use() { 1581built_with_use() {
1535 local opt=$1 1582 local opt=$1
1536 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1583 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1537 1584
1538 local PKG=$(best_version $1) 1585 local PKG=$(best_version $1)
1586 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1539 shift 1587 shift
1540 1588
1541 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1589 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1542 [[ ! -e ${USEFILE} ]] && return 1 1590
1591 # if the USE file doesnt exist, assume the $PKG is either
1592 # injected or package.provided
1593 [[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with"
1543 1594
1544 local USE_BUILT=$(<${USEFILE}) 1595 local USE_BUILT=$(<${USEFILE})
1545 while [[ $# -gt 0 ]] ; do 1596 while [[ $# -gt 0 ]] ; do
1546 if [[ ${opt} = "-o" ]] ; then 1597 if [[ ${opt} = "-o" ]] ; then
1547 has $1 ${USE_BUILT} && return 0 1598 has $1 ${USE_BUILT} && return 0
1599# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1650# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1600# $5 == path for wrapper 1651# $5 == path for wrapper
1601make_wrapper() { 1652make_wrapper() {
1602 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1653 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1603 local tmpwrapper=$(emktemp) 1654 local tmpwrapper=$(emktemp)
1655 # We don't want to quote ${bin} so that people can pass complex
1656 # things as $bin ... "./someprog --args"
1604 cat << EOF > "${tmpwrapper}" 1657 cat << EOF > "${tmpwrapper}"
1605#!/bin/sh 1658#!/bin/sh
1606cd "${chdir}" 1659cd "${chdir:-.}"
1660if [ -n "${libdir}" ] ; then
1661 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1607export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1662 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1663 else
1664 export LD_LIBRARY_PATH="${libdir}"
1665 fi
1666fi
1608exec ${bin} "\$@" 1667exec ${bin} "\$@"
1609EOF 1668EOF
1610 chmod go+rx "${tmpwrapper}" 1669 chmod go+rx "${tmpwrapper}"
1611 if [ -n "${5}" ] 1670 if [[ -n ${path} ]] ; then
1612 then
1613 exeinto ${5} 1671 exeinto "${path}"
1614 newexe "${tmpwrapper}" "${wrapper}" 1672 newexe "${tmpwrapper}" "${wrapper}"
1615 else 1673 else
1616 newbin "${tmpwrapper}" "${wrapper}" 1674 newbin "${tmpwrapper}" "${wrapper}"
1617 fi 1675 fi
1618} 1676}

Legend:
Removed from v.1.178  
changed lines
  Added in v.1.247

  ViewVC Help
Powered by ViewVC 1.1.20