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

Diff of /eclass/eutils.eclass

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

Revision 1.162 Revision 1.218
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2005 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.162 2005/03/23 12:46:11 ka0ttic Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.218 2005/11/22 11:15:34 flameeyes Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib 12inherit multilib portability
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15 13
16DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 16
18DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
19
20# ecpu_check
21# Usage:
22#
23# ecpu_check array_of_cpu_flags
24#
25# array_of_cpu_flags - An array of cpu flags to check against USE flags
26#
27# Checks user USE related cpu flags against /proc/cpuinfo. If user enables a
28# cpu flag that is not supported in their processor flags, it will warn the
29# user if CROSSCOMPILE is not set to 1 ( because cross compile users are
30# obviously using different cpu flags than their own cpu ). Examples:
31#
32# CPU_FLAGS=(mmx mmx2 sse sse2)
33# ecpu_check CPU_FLAGS
34# Chris White <chriswhite@gentoo.org> (03 Feb 2005)
35
36ecpu_check() {
37 # Think about changing below to: if [ "${CROSSCOMPILE}" -ne 1 -a -e "/proc/cpuinfo" ]
38 # and dropping the else if you do not plan on adding anything to that
39 # empty block ....
40 # PS: also try to add some quoting, and consider rather using ${foo} than $foo ...
41 if [ "${CROSSCOMPILE}" != "1" -a -e "/proc/cpuinfo" ]
42 then
43 CPU_FLAGS=${1}
44 USER_CPU=`grep "flags" /proc/cpuinfo`
45
46 for flags in `seq 1 ${#CPU_FLAGS[@]}`
47 do
48 if has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU} && ! has ${CPU_FLAGS[${flags} - 1]} ${USE}
49 then
50 ewarn "Your system is ${CPU_FLAGS[${flags} - 1]} capable but you don't have it enabled!"
51 ewarn "You might be cross compiling (in this case set CROSSCOMPILE to 1 to disable this warning."
52 fi
53
54 if ! has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU} && has ${CPU_FLAGS[${flags} -1]} ${USE}
55 then
56 ewarn "You have ${CPU_FLAGS[${flags} - 1]} support enabled but your processor doesn't"
57 ewarn "Seem to support it! You might be cross compiling or do not have /proc filesystem"
58 ewarn "enabled. If either is the case, set CROSSCOMPILE to 1 to disable this warning."
59 fi
60 done
61 fi
62}
63 18
64# Wait for the supplied number of seconds. If no argument is supplied, defaults 19# Wait for the supplied number of seconds. If no argument is supplied, defaults
65# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
66# outputting to a terminal, don't wait. For compatability purposes, the argument 21# outputting to a terminal, don't wait. For compatability purposes, the argument
67# must be an integer greater than zero. 22# must be an integer greater than zero.
109gen_usr_ldscript() { 64gen_usr_ldscript() {
110 local libdir="$(get_libdir)" 65 local libdir="$(get_libdir)"
111 # Just make sure it exists 66 # Just make sure it exists
112 dodir /usr/${libdir} 67 dodir /usr/${libdir}
113 68
114 while [[ $# -gt 0 ]] ; do 69 for lib in "${@}" ; do
115 cat > "${D}/usr/${libdir}/$1" <<-END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
116 /* GNU ld script 71 /* GNU ld script
117 Since Gentoo has critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
118 in /lib, and the static versions in /usr/lib, 73 in /lib, and the static versions in /usr/lib,
119 we need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
120 otherwise we run into linking problems. 75 otherwise we run into linking problems.
121 76
122 See bug http://bugs.gentoo.org/4411 for more info. 77 See bug http://bugs.gentoo.org/4411 for more info.
123 */ 78 */
124 GROUP ( /${libdir}/$1 ) 79 GROUP ( /${libdir}/${lib} )
125 END_LDSCRIPT 80 END_LDSCRIPT
126 fperms a+x "/usr/${libdir}/$1" 81 fperms a+x "/usr/${libdir}/${lib}"
127 shift
128 done 82 done
129} 83}
130 84
131# Simple function to draw a line consisting of '=' the same length as $* 85# Simple function to draw a line consisting of '=' the same length as $*
86# - only to be used by epatch()
132# 87#
133# <azarah@gentoo.org> (11 Nov 2002) 88# <azarah@gentoo.org> (11 Nov 2002)
134# 89#
135draw_line() { 90draw_line() {
136 local i=0 91 local i=0
162EPATCH_SOURCE="${WORKDIR}/patch" 117EPATCH_SOURCE="${WORKDIR}/patch"
163# Default extension for patches 118# Default extension for patches
164EPATCH_SUFFIX="patch.bz2" 119EPATCH_SUFFIX="patch.bz2"
165# Default options for patch 120# Default options for patch
166# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 121# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
167EPATCH_OPTS="-g0" 122# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch"
168# List of patches not to apply. Not this is only file names, 124# List of patches not to apply. Not this is only file names,
169# and not the full path .. 125# and not the full path ..
170EPATCH_EXCLUDE="" 126EPATCH_EXCLUDE=""
171# Change the printed message for a single patch. 127# Change the printed message for a single patch.
172EPATCH_SINGLE_MSG="" 128EPATCH_SINGLE_MSG=""
129# Change the printed message for multiple patches.
130EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
173# Force applying bulk patches even if not following the style: 131# Force applying bulk patches even if not following the style:
174# 132#
175# ??_${ARCH}_foo.${EPATCH_SUFFIX} 133# ??_${ARCH}_foo.${EPATCH_SUFFIX}
176# 134#
177EPATCH_FORCE="no" 135EPATCH_FORCE="no"
208# hand its a directory, it will set EPATCH_SOURCE to this. 166# hand its a directory, it will set EPATCH_SOURCE to this.
209# 167#
210# <azarah@gentoo.org> (10 Nov 2002) 168# <azarah@gentoo.org> (10 Nov 2002)
211# 169#
212epatch() { 170epatch() {
171 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
213 local PIPE_CMD="" 172 local PIPE_CMD=""
214 local STDERR_TARGET="${T}/$$.out" 173 local STDERR_TARGET="${T}/$$.out"
215 local PATCH_TARGET="${T}/$$.patch" 174 local PATCH_TARGET="${T}/$$.patch"
216 local PATCH_SUFFIX="" 175 local PATCH_SUFFIX=""
217 local SINGLE_PATCH="no" 176 local SINGLE_PATCH="no"
218 local x="" 177 local x=""
219 178
179 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
180
220 if [ "$#" -gt 1 ] 181 if [ "$#" -gt 1 ]
221 then 182 then
222 local m="" 183 local m=""
223 einfo "${#} patches to apply ..."
224 for m in "$@" ; do 184 for m in "$@" ; do
225 epatch "${m}" 185 epatch "${m}"
226 done 186 done
227 return 0 187 return 0
228 fi 188 fi
282 ;; 242 ;;
283 esac 243 esac
284 244
285 if [ "${SINGLE_PATCH}" = "no" ] 245 if [ "${SINGLE_PATCH}" = "no" ]
286 then 246 then
287 einfo "Applying various patches (bugfixes/updates) ..." 247 einfo "${EPATCH_MULTI_MSG}"
288 fi 248 fi
289 for x in ${EPATCH_SOURCE} 249 for x in ${EPATCH_SOURCE}
290 do 250 do
291 # New ARCH dependant patch naming scheme ... 251 # New ARCH dependant patch naming scheme ...
292 # 252 #
293 # ???_arch_foo.patch 253 # ???_arch_foo.patch
294 # 254 #
295 if [ -f ${x} ] && \ 255 if [ -f ${x} ] && \
296 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 256 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
297 [ "${EPATCH_FORCE}" = "yes" ]) 257 [ "${EPATCH_FORCE}" = "yes" ])
298 then 258 then
299 local count=0 259 local count=0
300 local popts="${EPATCH_OPTS}" 260 local popts="${EPATCH_OPTS}"
301 local patchname=${x##*/} 261 local patchname=${x##*/}
354 count=5 314 count=5
355 break 315 break
356 fi 316 fi
357 fi 317 fi
358 318
359 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 319 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
360 then 320 then
361 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 321 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
362 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
363 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 323 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
364 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 324 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
365 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 325 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
366 326
367 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 327 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
328 _epatch_assert
368 329
369 if [ "$?" -ne 0 ] 330 if [ "$?" -ne 0 ]
370 then 331 then
371 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 332 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
372 echo 333 echo
411 then 372 then
412 einfo "Done with patching" 373 einfo "Done with patching"
413 fi 374 fi
414} 375}
415 376
416# This function return true if we are using the NPTL pthreads
417# implementation.
418#
419# <azarah@gentoo.org> (06 March 2003)
420#
421have_NPTL() {
422 cat > ${T}/test-nptl.c <<-"END"
423 #define _XOPEN_SOURCE
424 #include <unistd.h>
425 #include <stdio.h>
426
427 int main()
428 {
429 char buf[255];
430 char *str = buf;
431
432 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
433 if (NULL != str) {
434 printf("%s\n", str);
435 if (NULL != strstr(str, "NPTL"))
436 return 0;
437 }
438
439 return 1;
440 }
441 END
442
443 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
444 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
445 then
446 echo "yes"
447 einfon "Checking what PTHREADS implementation we have ..."
448 if ${T}/nptl
449 then
450 return 0
451 else
452 return 1
453 fi
454 else
455 echo "no"
456 fi
457
458 return 1
459}
460
461# This function check how many cpu's are present, and then set
462# -j in MAKEOPTS accordingly.
463#
464# Thanks to nall <nall@gentoo.org> for this.
465#
466get_number_of_jobs() {
467 local jobs=0
468
469 if [ ! -r /proc/cpuinfo ]
470 then
471 return 1
472 fi
473
474 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
475 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
476 then
477 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
478 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
479 ADMINPARAM="${ADMINPARAM/-j}"
480 fi
481
482 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
483
484 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
485 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
486 then
487 # these archs will always have "[Pp]rocessor"
488 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
489
490 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
491 then
492 # sparc always has "ncpus active"
493 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
494
495 elif [ "${ARCH}" = "alpha" ]
496 then
497 # alpha has "cpus active", but only when compiled with SMP
498 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
499 then
500 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
501 else
502 jobs=2
503 fi
504
505 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
506 then
507 # ppc has "processor", but only when compiled with SMP
508 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
509 then
510 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
511 else
512 jobs=2
513 fi
514 elif [ "${ARCH}" = "s390" ]
515 then
516 # s390 has "# processors : "
517 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
518 else
519 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
520 die "Unknown ARCH -- ${ARCH}!"
521 fi
522
523 # Make sure the number is valid ...
524 if [ "${jobs}" -lt 1 ]
525 then
526 jobs=1
527 fi
528
529 if [ -n "${ADMINPARAM}" ]
530 then
531 if [ "${jobs}" -gt "${ADMINPARAM}" ]
532 then
533 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
534 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
535 else
536 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
537 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
538 fi
539 fi
540}
541
542# Cheap replacement for when debianutils (and thus mktemp) 377# Cheap replacement for when debianutils (and thus mktemp)
543# does not exist on the users system 378# does not exist on the users system
544# vapier@gentoo.org 379# vapier@gentoo.org
545# 380#
546# Takes just 1 optional parameter (the directory to create tmpfile in) 381# Takes just 1 optional parameter (the directory to create tmpfile in)
547emktemp() { 382emktemp() {
548 local exe="touch" 383 local exe="touch"
549 [ "$1" == "-d" ] && exe="mkdir" && shift 384 [[ $1 == -d ]] && exe="mkdir" && shift
550 local topdir="$1" 385 local topdir=$1
551 386
552 if [ -z "${topdir}" ] 387 if [[ -z ${topdir} ]] ; then
553 then
554 [ -z "${T}" ] \ 388 [[ -z ${T} ]] \
555 && topdir="/tmp" \ 389 && topdir="/tmp" \
556 || topdir="${T}" 390 || topdir=${T}
557 fi 391 fi
558 392
559 if [ -z "$(type -p mktemp)" ] 393 if [[ -z $(type -p mktemp) ]] ; then
560 then
561 local tmp=/ 394 local tmp=/
562 while [ -e "${tmp}" ] ; do 395 while [[ -e ${tmp} ]] ; do
563 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 396 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
564 done 397 done
565 ${exe} "${tmp}" 398 ${exe} "${tmp}" || ${exe} -p "${tmp}"
566 echo "${tmp}" 399 echo "${tmp}"
567 else 400 else
568 [ "${exe}" == "touch" ] \ 401 [[ ${exe} == "touch" ]] \
569 && exe="-p" \ 402 && exe="-p" \
570 || exe="-d" 403 || exe="-d"
571 mktemp ${exe} "${topdir}" 404 mktemp ${exe} "${topdir}"
572 fi 405 fi
573} 406}
577# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
578# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
579# 412#
580# egetent(database, key) 413# egetent(database, key)
581egetent() { 414egetent() {
582 if useq ppc-macos ; then 415 case ${CHOST} in
416 *-darwin*)
583 case "$2" in 417 case "$2" in
584 *[!0-9]*) # Non numeric 418 *[!0-9]*) # Non numeric
585 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
586 ;; 420 ;;
587 *) # Numeric 421 *) # Numeric
588 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 422 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
589 ;; 423 ;;
590 esac 424 esac
591 elif useq x86-fbsd ; then 425 ;;
592 local action 426 *-freebsd*)
593 if [ "$1" == "passwd" ] 427 local opts action="user"
594 then 428 [[ $1 == "passwd" ]] || action="group"
595 action="user" 429
596 else 430 # lookup by uid/gid
597 action="group" 431 if [[ $2 == [[:digit:]]* ]] ; then
432 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
598 fi 433 fi
434
599 pw show "${action}" "$2" -q 435 pw show ${action} ${opts} "$2" -q
600 else 436 ;;
437 *-netbsd*|*-openbsd*)
438 grep "$2:\*:" /etc/$1
439 ;;
440 *)
601 which nscd >& /dev/null && nscd -i "$1" 441 type -p nscd >& /dev/null && nscd -i "$1"
602 getent "$1" "$2" 442 getent "$1" "$2"
603 fi 443 ;;
444 esac
604} 445}
605 446
606# Simplify/standardize adding users to the system 447# Simplify/standardize adding users to the system
607# vapier@gentoo.org 448# vapier@gentoo.org
608# 449#
616# homedir: /dev/null 457# homedir: /dev/null
617# groups: none 458# groups: none
618# extra: comment of 'added by portage for ${PN}' 459# extra: comment of 'added by portage for ${PN}'
619enewuser() { 460enewuser() {
620 # get the username 461 # get the username
621 local euser="$1"; shift 462 local euser=$1; shift
622 if [ -z "${euser}" ] 463 if [[ -z ${euser} ]] ; then
623 then
624 eerror "No username specified !" 464 eerror "No username specified !"
625 die "Cannot call enewuser without a username" 465 die "Cannot call enewuser without a username"
626 fi 466 fi
627 467
628 # lets see if the username already exists 468 # lets see if the username already exists
629 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 469 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
630 then
631 return 0 470 return 0
632 fi 471 fi
633 einfo "Adding user '${euser}' to your system ..." 472 einfo "Adding user '${euser}' to your system ..."
634 473
635 # options to pass to useradd 474 # options to pass to useradd
636 local opts= 475 local opts=
637 476
638 # handle uid 477 # handle uid
639 local euid="$1"; shift 478 local euid=$1; shift
640 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 479 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
641 then
642 if [ "${euid}" -gt 0 ] 480 if [[ ${euid} -gt 0 ]] ; then
643 then
644 if [ ! -z "`egetent passwd ${euid}`" ] 481 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
645 then
646 euid="next" 482 euid="next"
647 fi 483 fi
648 else 484 else
649 eerror "Userid given but is not greater than 0 !" 485 eerror "Userid given but is not greater than 0 !"
650 die "${euid} is not a valid UID" 486 die "${euid} is not a valid UID"
651 fi 487 fi
652 else 488 else
653 euid="next" 489 euid="next"
654 fi 490 fi
655 if [ "${euid}" == "next" ] 491 if [[ ${euid} == "next" ]] ; then
656 then 492 for euid in $(seq 101 999) ; do
657 local pwrange
658 if [ "${USERLAND}" == "BSD" ] ; then
659 pwrange="`jot 898 101`"
660 else
661 pwrange="`seq 101 999`"
662 fi
663 for euid in ${pwrange} ; do
664 [ -z "`egetent passwd ${euid}`" ] && break 493 [[ -z $(egetent passwd ${euid}) ]] && break
665 done 494 done
666 fi 495 fi
667 opts="${opts} -u ${euid}" 496 opts="${opts} -u ${euid}"
668 einfo " - Userid: ${euid}" 497 einfo " - Userid: ${euid}"
669 498
670 # handle shell 499 # handle shell
671 local eshell="$1"; shift 500 local eshell=$1; shift
672 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 501 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
673 then
674 if [ ! -e "${eshell}" ] 502 if [[ ! -e ${eshell} ]] ; then
675 then
676 eerror "A shell was specified but it does not exist !" 503 eerror "A shell was specified but it does not exist !"
677 die "${eshell} does not exist" 504 die "${eshell} does not exist"
678 fi 505 fi
679 else 506 else
680 if [ "${USERLAND}" == "BSD" ] 507 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
681 then 508 [[ -x ${ROOT}${shell} ]] && break
682 eshell="/usr/bin/false" 509 done
683 else 510
684 eshell="/bin/false" 511 if [[ ${shell} == "/dev/null" ]] ; then
512 eerror "Unable to identify the shell to use"
513 die "Unable to identify the shell to use"
685 fi 514 fi
515
516 eshell=${shell}
686 fi 517 fi
687 einfo " - Shell: ${eshell}" 518 einfo " - Shell: ${eshell}"
688 opts="${opts} -s ${eshell}" 519 opts="${opts} -s ${eshell}"
689 520
690 # handle homedir 521 # handle homedir
691 local ehome="$1"; shift 522 local ehome=$1; shift
692 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 523 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
693 then
694 ehome="/dev/null" 524 ehome="/dev/null"
695 fi 525 fi
696 einfo " - Home: ${ehome}" 526 einfo " - Home: ${ehome}"
697 opts="${opts} -d ${ehome}" 527 opts="${opts} -d ${ehome}"
698 528
699 # handle groups 529 # handle groups
700 local egroups="$1"; shift 530 local egroups=$1; shift
701 if [ ! -z "${egroups}" ] 531 if [[ ! -z ${egroups} ]] ; then
702 then
703 local oldifs="${IFS}" 532 local oldifs=${IFS}
704 local defgroup="" exgroups="" 533 local defgroup="" exgroups=""
705 534
706 export IFS="," 535 export IFS=","
707 for g in ${egroups} 536 for g in ${egroups} ; do
708 do
709 export IFS="${oldifs}" 537 export IFS=${oldifs}
710 if [ -z "`egetent group \"${g}\"`" ] 538 if [[ -z $(egetent group "${g}") ]] ; then
711 then
712 eerror "You must add group ${g} to the system first" 539 eerror "You must add group ${g} to the system first"
713 die "${g} is not a valid GID" 540 die "${g} is not a valid GID"
714 fi 541 fi
715 if [ -z "${defgroup}" ] 542 if [[ -z ${defgroup} ]] ; then
716 then
717 defgroup="${g}" 543 defgroup=${g}
718 else 544 else
719 exgroups="${exgroups},${g}" 545 exgroups="${exgroups},${g}"
720 fi 546 fi
721 export IFS="," 547 export IFS=","
722 done 548 done
723 export IFS="${oldifs}" 549 export IFS=${oldifs}
724 550
725 opts="${opts} -g ${defgroup}" 551 opts="${opts} -g ${defgroup}"
726 if [ ! -z "${exgroups}" ] 552 if [[ ! -z ${exgroups} ]] ; then
727 then
728 opts="${opts} -G ${exgroups:1}" 553 opts="${opts} -G ${exgroups:1}"
729 fi 554 fi
730 else 555 else
731 egroups="(none)" 556 egroups="(none)"
732 fi 557 fi
733 einfo " - Groups: ${egroups}" 558 einfo " - Groups: ${egroups}"
734 559
735 # handle extra and add the user 560 # handle extra and add the user
736 local eextra="$@"
737 local oldsandbox="${SANDBOX_ON}" 561 local oldsandbox=${SANDBOX_ON}
738 export SANDBOX_ON="0" 562 export SANDBOX_ON="0"
739 if useq ppc-macos 563 case ${CHOST} in
740 then 564 *-darwin*)
741 ### Make the user 565 ### Make the user
742 if [ -z "${eextra}" ] 566 if [[ -z $@ ]] ; then
743 then
744 dscl . create /users/${euser} uid ${euid} 567 dscl . create /users/${euser} uid ${euid}
745 dscl . create /users/${euser} shell ${eshell} 568 dscl . create /users/${euser} shell ${eshell}
746 dscl . create /users/${euser} home ${ehome} 569 dscl . create /users/${euser} home ${ehome}
747 dscl . create /users/${euser} realname "added by portage for ${PN}" 570 dscl . create /users/${euser} realname "added by portage for ${PN}"
748 ### Add the user to the groups specified 571 ### Add the user to the groups specified
749 local oldifs="${IFS}" 572 local oldifs=${IFS}
750 export IFS="," 573 export IFS=","
751 for g in ${egroups} 574 for g in ${egroups} ; do
752 do
753 dscl . merge /groups/${g} users ${euser} 575 dscl . merge /groups/${g} users ${euser}
754 done 576 done
755 export IFS="${oldifs}" 577 export IFS=${oldifs}
756 else 578 else
757 einfo "Extra options are not supported on macos yet" 579 einfo "Extra options are not supported on Darwin yet"
758 einfo "Please report the ebuild along with the info below" 580 einfo "Please report the ebuild along with the info below"
759 einfo "eextra: ${eextra}" 581 einfo "eextra: $@"
760 die "Required function missing" 582 die "Required function missing"
761 fi 583 fi
762 elif use x86-fbsd ; then 584 ;;
763 if [ -z "${eextra}" ] 585 *-freebsd*)
764 then 586 if [[ -z $@ ]] ; then
765 pw useradd ${euser} ${opts} \ 587 pw useradd ${euser} ${opts} \
766 -c "added by portage for ${PN}" \ 588 -c "added by portage for ${PN}" \
767 die "enewuser failed" 589 die "enewuser failed"
768 else 590 else
769 einfo " - Extra: ${eextra}" 591 einfo " - Extra: $@"
770 pw useradd ${euser} ${opts} \ 592 pw useradd ${euser} ${opts} \
771 -c ${eextra} || die "enewuser failed" 593 "$@" || die "enewuser failed"
772 fi 594 fi
595 ;;
596
597 *-netbsd*)
598 if [[ -z $@ ]] ; then
599 useradd ${opts} ${euser} || die "enewuser failed"
773 else 600 else
774 if [ -z "${eextra}" ] 601 einfo " - Extra: $@"
775 then 602 useradd ${opts} ${euser} "$@" || die "enewuser failed"
603 fi
604 ;;
605
606 *-openbsd*)
607 if [[ -z $@ ]] ; then
608 useradd -u ${euid} -s ${eshell} \
609 -d ${ehome} -c "Added by portage for ${PN}" \
610 -g ${egroups} ${euser} || die "enewuser failed"
611 else
612 einfo " - Extra: $@"
613 useradd -u ${euid} -s ${eshell} \
614 -d ${ehome} -c "Added by portage for ${PN}" \
615 -g ${egroups} ${euser} "$@" || die "enewuser failed"
616 fi
617 ;;
618
619 *)
620 if [[ -z $@ ]] ; then
776 useradd ${opts} ${euser} \ 621 useradd ${opts} ${euser} \
777 -c "added by portage for ${PN}" \ 622 -c "added by portage for ${PN}" \
778 || die "enewuser failed" 623 || die "enewuser failed"
779 else 624 else
780 einfo " - Extra: ${eextra}" 625 einfo " - Extra: $@"
781 useradd ${opts} ${euser} ${eextra} \ 626 useradd ${opts} ${euser} "$@" \
782 || die "enewuser failed" 627 || die "enewuser failed"
783 fi 628 fi
629 ;;
630 esac
631
632 if [[ ! -e ${ROOT}/${ehome} ]] ; then
633 einfo " - Creating ${ehome} in ${ROOT}"
634 mkdir -p "${ROOT}/${ehome}"
635 chown ${euser} "${ROOT}/${ehome}"
636 chmod 755 "${ROOT}/${ehome}"
784 fi 637 fi
638
785 export SANDBOX_ON="${oldsandbox}" 639 export SANDBOX_ON=${oldsandbox}
786
787 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
788 then
789 einfo " - Creating ${ehome} in ${D}"
790 dodir ${ehome}
791 fowners ${euser} ${ehome}
792 fperms 755 ${ehome}
793 fi
794} 640}
795 641
796# Simplify/standardize adding groups to the system 642# Simplify/standardize adding groups to the system
797# vapier@gentoo.org 643# vapier@gentoo.org
798# 644#
827 then 673 then
828 if [ "${egid}" -gt 0 ] 674 if [ "${egid}" -gt 0 ]
829 then 675 then
830 if [ -z "`egetent group ${egid}`" ] 676 if [ -z "`egetent group ${egid}`" ]
831 then 677 then
832 if useq ppc-macos ; then 678 if [[ "${CHOST}" == *-darwin* ]]; then
833 opts="${opts} ${egid}" 679 opts="${opts} ${egid}"
834 else 680 else
835 opts="${opts} -g ${egid}" 681 opts="${opts} -g ${egid}"
836 fi 682 fi
837 else 683 else
851 opts="${opts} ${eextra}" 697 opts="${opts} ${eextra}"
852 698
853 # add the group 699 # add the group
854 local oldsandbox="${SANDBOX_ON}" 700 local oldsandbox="${SANDBOX_ON}"
855 export SANDBOX_ON="0" 701 export SANDBOX_ON="0"
856 if useq ppc-macos ; then 702 case ${CHOST} in
703 *-darwin*)
857 if [ ! -z "${eextra}" ]; 704 if [ ! -z "${eextra}" ];
858 then 705 then
859 einfo "Extra options are not supported on macos yet" 706 einfo "Extra options are not supported on Darwin/OS X yet"
860 einfo "Please report the ebuild along with the info below" 707 einfo "Please report the ebuild along with the info below"
861 einfo "eextra: ${eextra}" 708 einfo "eextra: ${eextra}"
862 die "Required function missing" 709 die "Required function missing"
863 fi 710 fi
864 711
865 # If we need the next available 712 # If we need the next available
866 case ${egid} in 713 case ${egid} in
867 *[!0-9]*) # Non numeric 714 *[!0-9]*) # Non numeric
868 for egid in `jot 898 101`; do 715 for egid in $(seq 101 999); do
869 [ -z "`egetent group ${egid}`" ] && break 716 [ -z "`egetent group ${egid}`" ] && break
870 done 717 done
871 esac 718 esac
872 dscl . create /groups/${egroup} gid ${egid} 719 dscl . create /groups/${egroup} gid ${egid}
873 dscl . create /groups/${egroup} passwd '*' 720 dscl . create /groups/${egroup} passwd '*'
874 elif use x86-fbsd ; then 721 ;;
722
723 *-freebsd*)
875 case ${egid} in 724 case ${egid} in
876 *[!0-9]*) # Non numeric 725 *[!0-9]*) # Non numeric
877 for egid in `jot 898 101`; do 726 for egid in $(seq 101 999); do
878 [ -z "`egetent group ${egid}`" ] && break 727 [ -z "`egetent group ${egid}`" ] && break
879 done 728 done
880 esac 729 esac
881 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 730 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
882 else 731 ;;
732
733 *-netbsd*)
734 case ${egid} in
735 *[!0-9]*) # Non numeric
736 for egid in $(seq 101 999); do
737 [ -z "`egetent group ${egid}`" ] && break
738 done
739 esac
740 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
741 ;;
742
743 *)
883 groupadd ${opts} ${egroup} || die "enewgroup failed" 744 groupadd ${opts} ${egroup} || die "enewgroup failed"
884 fi 745 ;;
746 esac
885 export SANDBOX_ON="${oldsandbox}" 747 export SANDBOX_ON="${oldsandbox}"
886} 748}
887 749
888# Simple script to replace 'dos2unix' binaries 750# Simple script to replace 'dos2unix' binaries
889# vapier@gentoo.org 751# vapier@gentoo.org
914# name: the name that will show up in the menu 776# name: the name that will show up in the menu
915# icon: give your little like a pretty little icon ... 777# icon: give your little like a pretty little icon ...
916# this can be relative (to /usr/share/pixmaps) or 778# this can be relative (to /usr/share/pixmaps) or
917# a full path to an icon 779# a full path to an icon
918# type: what kind of application is this ? for categories: 780# type: what kind of application is this ? for categories:
919# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 781# http://www.freedesktop.org/Standards/desktop-entry-spec
920# path: if your app needs to startup in a specific dir 782# path: if your app needs to startup in a specific dir
921make_desktop_entry() { 783make_desktop_entry() {
922 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 784 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
923 785
924 local exec=${1} 786 local exec=${1}
950 dev) 812 dev)
951 type="Development" 813 type="Development"
952 ;; 814 ;;
953 815
954 games) 816 games)
955 [[ -z ${path} ]] && path=${GAMES_BINDIR}
956
957 case ${catmin} in 817 case ${catmin} in
958 action) type=ActionGame;; 818 action) type=ActionGame;;
959 arcade) type=ArcadeGame;; 819 arcade) type=ArcadeGame;;
960 board) type=BoardGame;; 820 board) type=BoardGame;;
961 kid) type=KidsGame;; 821 kid) type=KidsGame;;
1002 type="Network;${type}" 862 type="Network;${type}"
1003 ;; 863 ;;
1004 864
1005 sci) 865 sci)
1006 case ${catmin} in 866 case ${catmin} in
1007 astro*) type=Astronomoy;; 867 astro*) type=Astronomy;;
1008 bio*) type=Biology;; 868 bio*) type=Biology;;
1009 calc*) type=Calculator;; 869 calc*) type=Calculator;;
1010 chem*) type=Chemistry;; 870 chem*) type=Chemistry;;
1011 geo*) type=Geology;; 871 geo*) type=Geology;;
1012 math*) type=Math;; 872 math*) type=Math;;
1026 *) 886 *)
1027 type= 887 type=
1028 ;; 888 ;;
1029 esac 889 esac
1030 fi 890 fi
1031 891 if [ "${SLOT}" == "0" ] ; then
892 local desktop_name="${PN}"
893 else
894 local desktop_name="${PN}-${SLOT}"
895 fi
1032 local desktop=${T}/${exec%% *}-${P}.desktop 896 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
1033 897
1034echo "[Desktop Entry] 898echo "[Desktop Entry]
1035Encoding=UTF-8 899Encoding=UTF-8
1036Version=0.9.2 900Version=0.9.2
1037Name=${name} 901Name=${name}
1040Exec=${exec} 904Exec=${exec}
1041Path=${path} 905Path=${path}
1042Icon=${icon} 906Icon=${icon}
1043Categories=Application;${type};" > "${desktop}" 907Categories=Application;${type};" > "${desktop}"
1044 908
909 (
910 # wrap the env here so that the 'insinto' call
911 # doesn't corrupt the env of the caller
1045 insinto /usr/share/applications 912 insinto /usr/share/applications
1046 doins "${desktop}" 913 doins "${desktop}"
1047 914 )
1048 return 0
1049} 915}
1050 916
1051# Make a GDM/KDM Session file 917# Make a GDM/KDM Session file
1052# 918#
1053# make_desktop_entry(<title>, <command>) 919# make_desktop_entry(<title>, <command>)
1054# title: File to execute to start the Window Manager 920# title: File to execute to start the Window Manager
1055# command: Name of the Window Manager 921# command: Name of the Window Manager
1056 922
1057make_session_desktop() { 923make_session_desktop() {
1058
1059 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 924 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
1060 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1 925 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
1061 926
1062 local title="${1}" 927 local title=$1
1063 local command="${2}" 928 local command=$2
1064 local desktop="${T}/${wm}.desktop" 929 local desktop=${T}/${wm}.desktop
1065 930
1066echo "[Desktop Entry] 931echo "[Desktop Entry]
1067Encoding=UTF-8 932Encoding=UTF-8
1068Name=${title} 933Name=${title}
1069Comment=This session logs you into ${title} 934Comment=This session logs you into ${title}
1071TryExec=${command} 936TryExec=${command}
1072Type=Application" > "${desktop}" 937Type=Application" > "${desktop}"
1073 938
1074 insinto /usr/share/xsessions 939 insinto /usr/share/xsessions
1075 doins "${desktop}" 940 doins "${desktop}"
1076
1077 return 0
1078} 941}
1079 942
1080domenu() { 943domenu() {
1081 local i 944 local i j
1082 local j
1083 insinto /usr/share/applications 945 insinto /usr/share/applications
1084 for i in ${@} 946 for i in "$@" ; do
1085 do
1086 if [ -f "${i}" ]; 947 if [[ -f ${i} ]] ; then
1087 then
1088 doins ${i} 948 doins "${i}"
1089 elif [ -d "${i}" ]; 949 elif [[ -d ${i} ]] ; then
1090 then
1091 for j in ${i}/*.desktop 950 for j in "${i}"/*.desktop ; do
1092 do
1093 doins ${j} 951 doins "${j}"
1094 done 952 done
1095 fi 953 fi
1096 done 954 done
1097} 955}
956newmenu() {
957 insinto /usr/share/applications
958 newins "$1" "$2"
959}
1098 960
1099doicon() { 961doicon() {
1100 local i 962 local i j
1101 local j
1102 insinto /usr/share/pixmaps 963 insinto /usr/share/pixmaps
1103 for i in ${@} 964 for i in "$@" ; do
1104 do
1105 if [ -f "${i}" ]; 965 if [[ -f ${i} ]] ; then
1106 then
1107 doins ${i} 966 doins "${i}"
1108 elif [ -d "${i}" ]; 967 elif [[ -d ${i} ]] ; then
1109 then
1110 for j in ${i}/*.png 968 for j in "${i}"/*.png ; do
1111 do
1112 doins ${j} 969 doins "${j}"
1113 done 970 done
1114 fi 971 fi
1115 done 972 done
973}
974newicon() {
975 insinto /usr/share/pixmaps
976 newins "$1" "$2"
1116} 977}
1117 978
1118############################################################## 979##############################################################
1119# END: Handle .desktop files and menu entries # 980# END: Handle .desktop files and menu entries #
1120############################################################## 981##############################################################
1121 982
1122 983
1123# for internal use only (unpack_pdv and unpack_makeself) 984# for internal use only (unpack_pdv and unpack_makeself)
1124find_unpackable_file() { 985find_unpackable_file() {
1125 local src="$1" 986 local src=$1
1126 if [ -z "${src}" ] 987 if [[ -z ${src} ]] ; then
1127 then
1128 src="${DISTDIR}/${A}" 988 src=${DISTDIR}/${A}
1129 else 989 else
1130 if [ -e "${DISTDIR}/${src}" ] 990 if [[ -e ${DISTDIR}/${src} ]] ; then
1131 then
1132 src="${DISTDIR}/${src}" 991 src=${DISTDIR}/${src}
1133 elif [ -e "${PWD}/${src}" ] 992 elif [[ -e ${PWD}/${src} ]] ; then
1134 then
1135 src="${PWD}/${src}" 993 src=${PWD}/${src}
1136 elif [ -e "${src}" ] 994 elif [[ -e ${src} ]] ; then
1137 then
1138 src="${src}" 995 src=${src}
1139 fi
1140 fi 996 fi
1141 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 997 fi
998 [[ ! -e ${src} ]] && return 1
1142 echo "${src}" 999 echo "${src}"
1143} 1000}
1144 1001
1145# Unpack those pesky pdv generated files ... 1002# Unpack those pesky pdv generated files ...
1146# They're self-unpacking programs with the binary package stuffed in 1003# They're self-unpacking programs with the binary package stuffed in
1161# lseek 1018# lseek
1162# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1019# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1163# lseek(3, -4, SEEK_END) = 2981250 1020# lseek(3, -4, SEEK_END) = 2981250
1164# thus we would pass in the value of '4' as the second parameter. 1021# thus we would pass in the value of '4' as the second parameter.
1165unpack_pdv() { 1022unpack_pdv() {
1166 local src="`find_unpackable_file $1`" 1023 local src=$(find_unpackable_file $1)
1167 local sizeoff_t="$2" 1024 local sizeoff_t=$2
1168 1025
1026 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1169 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1027 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1170 1028
1171 local shrtsrc="`basename ${src}`" 1029 local shrtsrc=$(basename "${src}")
1172 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1030 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1173 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1031 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1174 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1032 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1175 1033
1176 # grab metadata for debug reasons 1034 # grab metadata for debug reasons
1240# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1098# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1241# - If the file is not specified then unpack will utilize ${A}. 1099# - If the file is not specified then unpack will utilize ${A}.
1242# - If the offset is not specified then we will attempt to extract 1100# - If the offset is not specified then we will attempt to extract
1243# the proper offset from the script itself. 1101# the proper offset from the script itself.
1244unpack_makeself() { 1102unpack_makeself() {
1103 local src_input=${1:-${A}}
1245 local src="$(find_unpackable_file "$1")" 1104 local src=$(find_unpackable_file "${src_input}")
1246 local skip="$2" 1105 local skip=$2
1247 local exe="$3" 1106 local exe=$3
1248 1107
1108 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1109
1249 local shrtsrc="$(basename "${src}")" 1110 local shrtsrc=$(basename "${src}")
1250 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1111 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1251 if [ -z "${skip}" ] 1112 if [[ -z ${skip} ]] ; then
1252 then
1253 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1113 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1254 local skip=0 1114 local skip=0
1255 exe=tail 1115 exe=tail
1256 case ${ver} in 1116 case ${ver} in
1257 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1117 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1258 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1118 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1270 ;; 1130 ;;
1271 2.1.3) 1131 2.1.3)
1272 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1132 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1273 let skip="skip + 1" 1133 let skip="skip + 1"
1274 ;; 1134 ;;
1275 2.1.4) 1135 2.1.4|2.1.5)
1276 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1136 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1277 skip=$(head -n ${skip} "${src}" | wc -c) 1137 skip=$(head -n ${skip} "${src}" | wc -c)
1278 exe="dd" 1138 exe="dd"
1279 ;; 1139 ;;
1280 *) 1140 *)
1325check_license() { 1185check_license() {
1326 local lic=$1 1186 local lic=$1
1327 if [ -z "${lic}" ] ; then 1187 if [ -z "${lic}" ] ; then
1328 lic="${PORTDIR}/licenses/${LICENSE}" 1188 lic="${PORTDIR}/licenses/${LICENSE}"
1329 else 1189 else
1330 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1190 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1331 lic="${PORTDIR}/licenses/${src}" 1191 lic="${PORTDIR}/licenses/${lic}"
1332 elif [ -e "${PWD}/${src}" ] ; then 1192 elif [ -e "${PWD}/${lic}" ] ; then
1333 lic="${PWD}/${src}" 1193 lic="${PWD}/${lic}"
1334 elif [ -e "${src}" ] ; then 1194 elif [ -e "${lic}" ] ; then
1335 lic="${src}" 1195 lic="${lic}"
1336 fi
1337 fi 1196 fi
1197 fi
1338 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1198 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1339 local l="`basename ${lic}`" 1199 local l="`basename ${lic}`"
1340 1200
1341 # here is where we check for the licenses the user already 1201 # here is where we check for the licenses the user already
1342 # accepted ... if we don't find a match, we make the user accept 1202 # accepted ... if we don't find a match, we make the user accept
1343 local shopts=$- 1203 local shopts=$-
1399 # first we figure out how many cds we're dealing with by 1259 # first we figure out how many cds we're dealing with by
1400 # the # of files they gave us 1260 # the # of files they gave us
1401 local cdcnt=0 1261 local cdcnt=0
1402 local f= 1262 local f=
1403 for f in "$@" ; do 1263 for f in "$@" ; do
1404 cdcnt=$((cdcnt + 1)) 1264 ((++cdcnt))
1405 export CDROM_CHECK_${cdcnt}="$f" 1265 export CDROM_CHECK_${cdcnt}="$f"
1406 done 1266 done
1407 export CDROM_TOTAL_CDS=${cdcnt} 1267 export CDROM_TOTAL_CDS=${cdcnt}
1408 export CDROM_CURRENT_CD=1 1268 export CDROM_CURRENT_CD=1
1409 1269
1410 # now we see if the user gave use CD_ROOT ... 1270 # now we see if the user gave use CD_ROOT ...
1411 # if they did, let's just believe them that it's correct 1271 # if they did, let's just believe them that it's correct
1412 if [[ ! -z ${CD_ROOT} ]] ; then
1413 export CDROM_ROOT=${CD_ROOT}
1414 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1415 return
1416 fi
1417 # do the same for CD_ROOT_X
1418 if [[ ! -z ${CD_ROOT_1} ]] ; then 1272 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1419 local var= 1273 local var=
1420 cdcnt=0 1274 cdcnt=0
1421 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1275 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1422 cdcnt=$((cdcnt + 1)) 1276 ((++cdcnt))
1423 var="CD_ROOT_${cdcnt}" 1277 var="CD_ROOT_${cdcnt}"
1278 [[ -z ${!var} ]] && var="CD_ROOT"
1424 if [[ -z ${!var} ]] ; then 1279 if [[ -z ${!var} ]] ; then
1425 eerror "You must either use just the CD_ROOT" 1280 eerror "You must either use just the CD_ROOT"
1426 eerror "or specify ALL the CD_ROOT_X variables." 1281 eerror "or specify ALL the CD_ROOT_X variables."
1427 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1282 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1428 die "could not locate CD_ROOT_${cdcnt}" 1283 die "could not locate CD_ROOT_${cdcnt}"
1429 fi 1284 fi
1430 export CDROM_ROOTS_${cdcnt}="${!var}"
1431 done 1285 done
1432 export CDROM_ROOT=${CDROM_ROOTS_1} 1286 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1433 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1287 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1288 export CDROM_SET=-1
1289 for f in ${CDROM_CHECK_1//:/ } ; do
1290 ((++CDROM_SET))
1291 [[ -e ${CD_ROOT}/${f} ]] && break
1292 done
1293 export CDROM_MATCH=${f}
1434 return 1294 return
1435 fi 1295 fi
1436 1296
1297 # User didn't help us out so lets make sure they know they can
1298 # simplify the whole process ...
1437 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1299 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1438 einfon "This ebuild will need the " 1300 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1439 if [[ -z ${CDROM_NAME} ]] ; then
1440 echo "cdrom for ${PN}."
1441 else
1442 echo "${CDROM_NAME}."
1443 fi
1444 echo 1301 echo
1445 einfo "If you do not have the CD, but have the data files" 1302 einfo "If you do not have the CD, but have the data files"
1446 einfo "mounted somewhere on your filesystem, just export" 1303 einfo "mounted somewhere on your filesystem, just export"
1447 einfo "the variable CD_ROOT so that it points to the" 1304 einfo "the variable CD_ROOT so that it points to the"
1448 einfo "directory containing the files." 1305 einfo "directory containing the files."
1452 echo 1309 echo
1453 else 1310 else
1454 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1311 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1455 cdcnt=0 1312 cdcnt=0
1456 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1313 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1457 cdcnt=$((cdcnt + 1)) 1314 ((++cdcnt))
1458 var="CDROM_NAME_${cdcnt}" 1315 var="CDROM_NAME_${cdcnt}"
1459 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1316 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1460 done 1317 done
1461 echo 1318 echo
1462 einfo "If you do not have the CDs, but have the data files" 1319 einfo "If you do not have the CDs, but have the data files"
1463 einfo "mounted somewhere on your filesystem, just export" 1320 einfo "mounted somewhere on your filesystem, just export"
1464 einfo "the following variables so they point to the right place:" 1321 einfo "the following variables so they point to the right place:"
1465 einfon "" 1322 einfon ""
1466 cdcnt=0 1323 cdcnt=0
1467 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1324 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1468 cdcnt=$((cdcnt + 1)) 1325 ((++cdcnt))
1469 echo -n " CD_ROOT_${cdcnt}" 1326 echo -n " CD_ROOT_${cdcnt}"
1470 done 1327 done
1471 echo 1328 echo
1472 einfo "Or, if you have all the files in the same place, or" 1329 einfo "Or, if you have all the files in the same place, or"
1473 einfo "you only have one cdrom, you can export CD_ROOT" 1330 einfo "you only have one cdrom, you can export CD_ROOT"
1476 echo 1333 echo
1477 einfo "For example:" 1334 einfo "For example:"
1478 einfo "export CD_ROOT_1=/mnt/cdrom" 1335 einfo "export CD_ROOT_1=/mnt/cdrom"
1479 echo 1336 echo
1480 fi 1337 fi
1338
1339 export CDROM_SET=""
1481 export CDROM_CURRENT_CD=0 1340 export CDROM_CURRENT_CD=0
1482 cdrom_load_next_cd 1341 cdrom_load_next_cd
1483} 1342}
1484 1343
1485# this is only used when you need access to more than one cd. 1344# this is only used when you need access to more than one cd.
1486# when you have finished using the first cd, just call this function. 1345# when you have finished using the first cd, just call this function.
1487# when it returns, CDROM_ROOT will be pointing to the second cd. 1346# when it returns, CDROM_ROOT will be pointing to the second cd.
1488# remember, you can only go forward in the cd chain, you can't go back. 1347# remember, you can only go forward in the cd chain, you can't go back.
1489cdrom_load_next_cd() { 1348cdrom_load_next_cd() {
1490 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1491 local var= 1349 local var
1492 1350 ((++CDROM_CURRENT_CD))
1493 if [[ ! -z ${CD_ROOT} ]] ; then
1494 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1495 return
1496 fi
1497 1351
1498 unset CDROM_ROOT 1352 unset CDROM_ROOT
1499 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1353 var=CD_ROOT_${CDROM_CURRENT_CD}
1354 [[ -z ${!var} ]] && var="CD_ROOT"
1500 if [[ -z ${!var} ]] ; then 1355 if [[ -z ${!var} ]] ; then
1501 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1356 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1502 cdrom_locate_file_on_cd ${!var} 1357 _cdrom_locate_file_on_cd ${!var}
1503 else 1358 else
1504 export CDROM_ROOT=${!var} 1359 export CDROM_ROOT=${!var}
1505 fi 1360 fi
1506 1361
1507 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1362 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1512# all it does is try to locate a give file on a cd ... if the cd isn't 1367# all it does is try to locate a give file on a cd ... if the cd isn't
1513# found, then a message asking for the user to insert the cdrom will be 1368# found, then a message asking for the user to insert the cdrom will be
1514# displayed and we'll hang out here until: 1369# displayed and we'll hang out here until:
1515# (1) the file is found on a mounted cdrom 1370# (1) the file is found on a mounted cdrom
1516# (2) the user hits CTRL+C 1371# (2) the user hits CTRL+C
1517cdrom_locate_file_on_cd() { 1372_cdrom_locate_file_on_cd() {
1373 local mline=""
1374 local showedmsg=0
1375
1518 while [[ -z ${CDROM_ROOT} ]] ; do 1376 while [[ -z ${CDROM_ROOT} ]] ; do
1377 local i=0
1378 local -a cdset=(${*//:/ })
1379 if [[ -n ${CDROM_SET} ]] ; then
1380 cdset=(${cdset[${CDROM_SET}]})
1381 fi
1382
1383 while [[ -n ${cdset[${i}]} ]] ; do
1519 local dir="$(dirname ${@})" 1384 local dir=$(dirname ${cdset[${i}]})
1520 local file="$(basename ${@})" 1385 local file=$(basename ${cdset[${i}]})
1521 local mline=""
1522 local showedmsg=0
1523 1386
1524 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1387 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1525 [[ -d ${mline}/${dir} ]] || continue 1388 [[ -d ${mline}/${dir} ]] || continue
1526 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1389 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1527 && export CDROM_ROOT=${mline} 1390 export CDROM_ROOT=${mline}
1391 export CDROM_SET=${i}
1392 export CDROM_MATCH=${cdset[${i}]}
1393 return
1394 fi
1395 done
1396
1397 ((++i))
1528 done 1398 done
1529 1399
1530 if [[ -z ${CDROM_ROOT} ]] ; then
1531 echo 1400 echo
1532 if [[ ${showedmsg} -eq 0 ]] ; then 1401 if [[ ${showedmsg} -eq 0 ]] ; then
1533 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1402 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1534 if [[ -z ${CDROM_NAME} ]] ; then 1403 if [[ -z ${CDROM_NAME} ]] ; then
1535 einfo "Please insert the cdrom for ${PN} now !" 1404 einfo "Please insert+mount the cdrom for ${PN} now !"
1536 else
1537 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1538 fi
1539 else 1405 else
1540 if [[ -z ${CDROM_NAME_1} ]] ; then
1541 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1542 else
1543 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1544 einfo "Please insert+mount the ${!var} cdrom now !" 1406 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1545 fi
1546 fi 1407 fi
1547 showedmsg=1 1408 else
1409 if [[ -z ${CDROM_NAME_1} ]] ; then
1410 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1411 else
1412 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1413 einfo "Please insert+mount the ${!var} cdrom now !"
1414 fi
1548 fi 1415 fi
1416 showedmsg=1
1417 fi
1549 einfo "Press return to scan for the cd again" 1418 einfo "Press return to scan for the cd again"
1550 einfo "or hit CTRL+C to abort the emerge." 1419 einfo "or hit CTRL+C to abort the emerge."
1420 echo
1421 einfo "If you are having trouble with the detection"
1422 einfo "of your CD, it is possible that you do not have"
1423 einfo "Joliet support enabled in your kernel. Please"
1424 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1551 read 1425 read
1552 fi
1553 done 1426 done
1554} 1427}
1555 1428
1556# Make sure that LINGUAS only contains languages that 1429# Make sure that LINGUAS only contains languages that
1557# a package can support 1430# a package can support
1599 else 1472 else
1600 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1473 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1601 fi 1474 fi
1602 done 1475 done
1603 if [[ -z ${newls} ]] ; then 1476 if [[ -z ${newls} ]] ; then
1604 unset LINGUAS 1477 export LINGUAS=""
1605 else 1478 else
1606 export LINGUAS=${newls:1} 1479 export LINGUAS=${newls:1}
1607 fi 1480 fi
1608} 1481}
1609 1482
1619 while ((i--)) ; do 1492 while ((i--)) ; do
1620 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1493 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1621 done 1494 done
1622 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1495 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1623 case ${ARCH} in 1496 case ${ARCH} in
1624 x86) export ARCH="i386";; 1497 x86) export ARCH="i386";;
1625 amd64) export ARCH="x86_64";; 1498 amd64) export ARCH="x86_64";;
1626 hppa) export ARCH="parisc";; 1499 hppa) export ARCH="parisc";;
1627 mips) export ARCH="mips";; 1500 mips) export ARCH="mips";;
1628 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one! 1501 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
1629 *) export ARCH="${ARCH}";; 1502 *) export ARCH="${ARCH}";;
1630 esac 1503 esac
1631} 1504}
1632 1505
1633# set's ARCH back to what portage expects 1506# set's ARCH back to what portage expects
1634set_arch_to_portage() { 1507set_arch_to_portage() {
1678 LIB=$1 1551 LIB=$1
1679 1552
1680 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1553 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1681 SONAME=`basename ${LIB}` 1554 SONAME=`basename ${LIB}`
1682 1555
1683 einfo "An old version of an installed library was detected on your system." 1556 ewarn "An old version of an installed library was detected on your system."
1684 einfo "In order to avoid breaking packages that link against is, this older version" 1557 ewarn "In order to avoid breaking packages that link against it, this older version"
1685 einfo "is not being removed. In order to make full use of this newer version," 1558 ewarn "is not being removed. In order to make full use of this newer version,"
1686 einfo "you will need to execute the following command:" 1559 ewarn "you will need to execute the following command:"
1687 einfo " revdep-rebuild --soname ${SONAME}" 1560 ewarn " revdep-rebuild --soname ${SONAME}"
1688 einfo 1561 ewarn
1689 einfo "After doing that, you can safely remove ${LIB}" 1562 ewarn "After doing that, you can safely remove ${LIB}"
1690 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1563 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1691 fi 1564 fi
1692} 1565}
1693 1566
1694# Hack for people to figure out if a package was built with 1567# Hack for people to figure out if a package was built with
1695# certain USE flags 1568# certain USE flags
1705 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1578 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1706 1579
1707 local PKG=$(best_version $1) 1580 local PKG=$(best_version $1)
1708 shift 1581 shift
1709 1582
1710 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1583 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1584
1585 # if the USE file doesnt exist, assume the $PKG is either
1586 # injected or package.provided
1711 [[ ! -e ${USEFILE} ]] && return 1 1587 [[ ! -e ${USEFILE} ]] && return 0
1712 1588
1713 local USE_BUILT=$(<${USEFILE}) 1589 local USE_BUILT=$(<${USEFILE})
1714 while [[ $# -gt 0 ]] ; do 1590 while [[ $# -gt 0 ]] ; do
1715 if [[ ${opt} = "-o" ]] ; then 1591 if [[ ${opt} = "-o" ]] ; then
1716 has $1 ${USE_BUILT} && return 0 1592 has $1 ${USE_BUILT} && return 0
1741dopamd() { 1617dopamd() {
1742 [[ -z $1 ]] && die "dopamd requires at least one argument" 1618 [[ -z $1 ]] && die "dopamd requires at least one argument"
1743 1619
1744 use pam || return 0 1620 use pam || return 0
1745 1621
1746 insinto /etc/pam.d 1622 INSDESTTREE=/etc/pam.d \
1747 doins "$@" || die "failed to install $@" 1623 doins "$@" || die "failed to install $@"
1748} 1624}
1749# newpamd <old name> <new name> 1625# newpamd <old name> <new name>
1750# 1626#
1751# Install pam file <old name> as <new name> in /etc/pam.d 1627# Install pam file <old name> as <new name> in /etc/pam.d
1752newpamd() { 1628newpamd() {
1753 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1629 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1754 1630
1755 use pam || return 0 1631 use pam || return 0
1756 1632
1757 insinto /etc/pam.d 1633 INSDESTTREE=/etc/pam.d \
1758 newins "$1" "$2" || die "failed to install $1 as $2" 1634 newins "$1" "$2" || die "failed to install $1 as $2"
1759} 1635}
1760 1636
1761# make a wrapper script ... 1637# make a wrapper script ...
1762# NOTE: this was originally games_make_wrapper, but I noticed other places where 1638# NOTE: this was originally games_make_wrapper, but I noticed other places where
1764# -- wolf31o2 1640# -- wolf31o2
1765# $1 == wrapper name 1641# $1 == wrapper name
1766# $2 == binary to run 1642# $2 == binary to run
1767# $3 == directory to chdir before running binary 1643# $3 == directory to chdir before running binary
1768# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1644# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1645# $5 == path for wrapper
1769make_wrapper() { 1646make_wrapper() {
1770 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 1647 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1771 local tmpwrapper=$(emktemp) 1648 local tmpwrapper=$(emktemp)
1649 # We don't want to quote ${bin} so that people can pass complex
1650 # things as $bin ... "./someprog --args"
1772 cat << EOF > "${tmpwrapper}" 1651 cat << EOF > "${tmpwrapper}"
1773#!/bin/sh 1652#!/bin/sh
1774cd "${chdir}" 1653cd "${chdir:-.}"
1654if [ -n "${libdir}" ] ; then
1655 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1775export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1656 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1657 else
1658 export LD_LIBRARY_PATH="${libdir}"
1659 fi
1660fi
1776exec ${bin} "\$@" 1661exec ${bin} "\$@"
1777EOF 1662EOF
1778 chmod go+rx "${tmpwrapper}" 1663 chmod go+rx "${tmpwrapper}"
1664 if [[ -n ${path} ]] ; then
1665 exeinto "${path}"
1666 newexe "${tmpwrapper}" "${wrapper}"
1667 else
1779 newbin "${tmpwrapper}" "${wrapper}" 1668 newbin "${tmpwrapper}" "${wrapper}"
1669 fi
1780} 1670}

Legend:
Removed from v.1.162  
changed lines
  Added in v.1.218

  ViewVC Help
Powered by ViewVC 1.1.20