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

Diff of /eclass/eutils.eclass

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

Revision 1.179 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.179 2005/05/28 05:50:29 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 [[ "${USERLAND}" == "Darwin" ]] ; 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 [[ "${USERLAND}" == "BSD" ]] ; 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}" == "Darwin" ]]; then 493 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
513 eshell="/usr/bin/false" 494 [[ -x ${ROOT}${shell} ]] && break
514 elif [[ "${USERLAND}" == "BSD" ]]; then 495 done
515 eshell="/usr/sbin/nologin" 496
516 else 497 if [[ ${shell} == "/dev/null" ]] ; then
517 eshell="/bin/false" 498 eerror "Unable to identify the shell to use"
499 die "Unable to identify the shell to use"
518 fi 500 fi
501
502 eshell=${shell}
519 fi 503 fi
520 einfo " - Shell: ${eshell}" 504 einfo " - Shell: ${eshell}"
521 opts="${opts} -s ${eshell}" 505 opts="${opts} -s ${eshell}"
522 506
523 # handle homedir 507 # handle homedir
524 local ehome="$1"; shift 508 local ehome=$1; shift
525 if [ -z "${ehome}" ] || [ "${eshell}" == "-1" ] 509 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
526 then
527 ehome="/dev/null" 510 ehome="/dev/null"
528 fi 511 fi
529 einfo " - Home: ${ehome}" 512 einfo " - Home: ${ehome}"
530 opts="${opts} -d ${ehome}" 513 opts="${opts} -d ${ehome}"
531 514
532 # handle groups 515 # handle groups
533 local egroups="$1"; shift 516 local egroups=$1; shift
534 if [ ! -z "${egroups}" ] 517 if [[ ! -z ${egroups} ]] ; then
535 then
536 local oldifs="${IFS}" 518 local oldifs=${IFS}
537 local defgroup="" exgroups="" 519 local defgroup="" exgroups=""
538 520
539 export IFS="," 521 export IFS=","
540 for g in ${egroups} 522 for g in ${egroups} ; do
541 do
542 export IFS="${oldifs}" 523 export IFS=${oldifs}
543 if [ -z "`egetent group \"${g}\"`" ] 524 if [[ -z $(egetent group "${g}") ]] ; then
544 then
545 eerror "You must add group ${g} to the system first" 525 eerror "You must add group ${g} to the system first"
546 die "${g} is not a valid GID" 526 die "${g} is not a valid GID"
547 fi 527 fi
548 if [ -z "${defgroup}" ] 528 if [[ -z ${defgroup} ]] ; then
549 then
550 defgroup="${g}" 529 defgroup=${g}
551 else 530 else
552 exgroups="${exgroups},${g}" 531 exgroups="${exgroups},${g}"
553 fi 532 fi
554 export IFS="," 533 export IFS=","
555 done 534 done
556 export IFS="${oldifs}" 535 export IFS=${oldifs}
557 536
558 opts="${opts} -g ${defgroup}" 537 opts="${opts} -g ${defgroup}"
559 if [ ! -z "${exgroups}" ] 538 if [[ ! -z ${exgroups} ]] ; then
560 then
561 opts="${opts} -G ${exgroups:1}" 539 opts="${opts} -G ${exgroups:1}"
562 fi 540 fi
563 else 541 else
564 egroups="(none)" 542 egroups="(none)"
565 fi 543 fi
566 einfo " - Groups: ${egroups}" 544 einfo " - Groups: ${egroups}"
567 545
568 # handle extra and add the user 546 # handle extra and add the user
569 local eextra="$@"
570 local oldsandbox="${SANDBOX_ON}" 547 local oldsandbox=${SANDBOX_ON}
571 export SANDBOX_ON="0" 548 export SANDBOX_ON="0"
572 if [[ "${USERLAND}" == "Darwin" ]] 549 case ${CHOST} in
573 then 550 *-darwin*)
574 ### Make the user 551 ### Make the user
575 if [ -z "${eextra}" ] 552 if [[ -z $@ ]] ; then
576 then
577 dscl . create /users/${euser} uid ${euid} 553 dscl . create /users/${euser} uid ${euid}
578 dscl . create /users/${euser} shell ${eshell} 554 dscl . create /users/${euser} shell ${eshell}
579 dscl . create /users/${euser} home ${ehome} 555 dscl . create /users/${euser} home ${ehome}
580 dscl . create /users/${euser} realname "added by portage for ${PN}" 556 dscl . create /users/${euser} realname "added by portage for ${PN}"
581 ### Add the user to the groups specified 557 ### Add the user to the groups specified
582 local oldifs="${IFS}" 558 local oldifs=${IFS}
583 export IFS="," 559 export IFS=","
584 for g in ${egroups} 560 for g in ${egroups} ; do
585 do
586 dscl . merge /groups/${g} users ${euser} 561 dscl . merge /groups/${g} users ${euser}
587 done 562 done
588 export IFS="${oldifs}" 563 export IFS=${oldifs}
589 else 564 else
590 einfo "Extra options are not supported on macos yet" 565 einfo "Extra options are not supported on Darwin yet"
591 einfo "Please report the ebuild along with the info below" 566 einfo "Please report the ebuild along with the info below"
592 einfo "eextra: ${eextra}" 567 einfo "eextra: $@"
593 die "Required function missing" 568 die "Required function missing"
594 fi 569 fi
595 elif [[ "${USERLAND}" == "BSD" ]] ; then 570 ;;
596 if [ -z "${eextra}" ] 571 *-freebsd*|*-dragonfly*)
597 then 572 if [[ -z $@ ]] ; then
598 pw useradd ${euser} ${opts} \ 573 pw useradd ${euser} ${opts} \
599 -c "added by portage for ${PN}" \ 574 -c "added by portage for ${PN}" \
600 die "enewuser failed" 575 die "enewuser failed"
601 else 576 else
602 einfo " - Extra: ${eextra}" 577 einfo " - Extra: $@"
603 pw useradd ${euser} ${opts} \ 578 pw useradd ${euser} ${opts} \
604 -c ${eextra} || die "enewuser failed" 579 "$@" || die "enewuser failed"
605 fi 580 fi
581 ;;
582
583 *-netbsd*)
584 if [[ -z $@ ]] ; then
585 useradd ${opts} ${euser} || die "enewuser failed"
606 else 586 else
607 if [ -z "${eextra}" ] 587 einfo " - Extra: $@"
608 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
609 useradd ${opts} ${euser} \ 607 useradd ${opts} ${euser} \
610 -c "added by portage for ${PN}" \ 608 -c "added by portage for ${PN}" \
611 || die "enewuser failed" 609 || die "enewuser failed"
612 else 610 else
613 einfo " - Extra: ${eextra}" 611 einfo " - Extra: $@"
614 useradd ${opts} ${euser} ${eextra} \ 612 useradd ${opts} ${euser} "$@" \
615 || die "enewuser failed" 613 || die "enewuser failed"
616 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}"
617 fi 623 fi
624
618 export SANDBOX_ON="${oldsandbox}" 625 export SANDBOX_ON=${oldsandbox}
619
620 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
621 then
622 einfo " - Creating ${ehome} in ${D}"
623 dodir ${ehome}
624 fowners ${euser} ${ehome}
625 fperms 755 ${ehome}
626 fi
627} 626}
628 627
629# Simplify/standardize adding groups to the system 628# Simplify/standardize adding groups to the system
630# vapier@gentoo.org 629# vapier@gentoo.org
631# 630#
634# Default values if you do not specify any: 633# Default values if you do not specify any:
635# groupname: REQUIRED ! 634# groupname: REQUIRED !
636# gid: next available (see groupadd(8)) 635# gid: next available (see groupadd(8))
637# extra: none 636# extra: none
638enewgroup() { 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
639 # get the group 645 # get the group
640 local egroup="$1"; shift 646 local egroup="$1"; shift
641 if [ -z "${egroup}" ] 647 if [ -z "${egroup}" ]
642 then 648 then
643 eerror "No group specified !" 649 eerror "No group specified !"
660 then 666 then
661 if [ "${egid}" -gt 0 ] 667 if [ "${egid}" -gt 0 ]
662 then 668 then
663 if [ -z "`egetent group ${egid}`" ] 669 if [ -z "`egetent group ${egid}`" ]
664 then 670 then
665 if [[ "${USERLAND}" == "Darwin" ]]; then 671 if [[ "${CHOST}" == *-darwin* ]]; then
666 opts="${opts} ${egid}" 672 opts="${opts} ${egid}"
667 else 673 else
668 opts="${opts} -g ${egid}" 674 opts="${opts} -g ${egid}"
669 fi 675 fi
670 else 676 else
684 opts="${opts} ${eextra}" 690 opts="${opts} ${eextra}"
685 691
686 # add the group 692 # add the group
687 local oldsandbox="${SANDBOX_ON}" 693 local oldsandbox="${SANDBOX_ON}"
688 export SANDBOX_ON="0" 694 export SANDBOX_ON="0"
689 if [[ "${USERLAND}" == "Darwin" ]]; then 695 case ${CHOST} in
696 *-darwin*)
690 if [ ! -z "${eextra}" ]; 697 if [ ! -z "${eextra}" ];
691 then 698 then
692 einfo "Extra options are not supported on Darwin/OS X yet" 699 einfo "Extra options are not supported on Darwin/OS X yet"
693 einfo "Please report the ebuild along with the info below" 700 einfo "Please report the ebuild along with the info below"
694 einfo "eextra: ${eextra}" 701 einfo "eextra: ${eextra}"
695 die "Required function missing" 702 die "Required function missing"
696 fi 703 fi
697 704
698 # If we need the next available 705 # If we need the next available
699 case ${egid} in 706 case ${egid} in
700 *[!0-9]*) # Non numeric 707 *[!0-9]*) # Non numeric
701 for egid in `jot 898 101`; do 708 for egid in $(seq 101 999); do
702 [ -z "`egetent group ${egid}`" ] && break 709 [ -z "`egetent group ${egid}`" ] && break
703 done 710 done
704 esac 711 esac
705 dscl . create /groups/${egroup} gid ${egid} 712 dscl . create /groups/${egroup} gid ${egid}
706 dscl . create /groups/${egroup} passwd '*' 713 dscl . create /groups/${egroup} passwd '*'
707 elif [[ "${USERLAND}" == "BSD" ]] ; then 714 ;;
715
716 *-freebsd*|*-dragonfly*)
708 case ${egid} in 717 case ${egid} in
709 *[!0-9]*) # Non numeric 718 *[!0-9]*) # Non numeric
710 for egid in `jot 898 101`; do 719 for egid in $(seq 101 999); do
711 [ -z "`egetent group ${egid}`" ] && break 720 [ -z "`egetent group ${egid}`" ] && break
712 done 721 done
713 esac 722 esac
714 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 723 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
715 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 *)
716 groupadd ${opts} ${egroup} || die "enewgroup failed" 737 groupadd ${opts} ${egroup} || die "enewgroup failed"
717 fi 738 ;;
739 esac
718 export SANDBOX_ON="${oldsandbox}" 740 export SANDBOX_ON="${oldsandbox}"
719} 741}
720 742
721# Simple script to replace 'dos2unix' binaries 743# Simple script to replace 'dos2unix' binaries
722# vapier@gentoo.org 744# vapier@gentoo.org
739 761
740# Make a desktop file ! 762# Make a desktop file !
741# Great for making those icons in kde/gnome startmenu ! 763# Great for making those icons in kde/gnome startmenu !
742# Amaze your friends ! Get the women ! Join today ! 764# Amaze your friends ! Get the women ! Join today !
743# 765#
744# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 766# make_desktop_entry(<command>, [name], [icon], [type], [path])
745# 767#
746# binary: what binary does the app run with ? 768# binary: what command does the app run with ?
747# name: the name that will show up in the menu 769# name: the name that will show up in the menu
748# icon: give your little like a pretty little icon ... 770# icon: give your little like a pretty little icon ...
749# this can be relative (to /usr/share/pixmaps) or 771# this can be relative (to /usr/share/pixmaps) or
750# a full path to an icon 772# a full path to an icon
751# type: what kind of application is this ? for categories: 773# type: what kind of application is this ? for categories:
752# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 774# http://www.freedesktop.org/Standards/desktop-entry-spec
753# path: if your app needs to startup in a specific dir 775# path: if your app needs to startup in a specific dir
754make_desktop_entry() { 776make_desktop_entry() {
755 [[ -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
756 778
757 local exec=${1} 779 local exec=${1}
783 dev) 805 dev)
784 type="Development" 806 type="Development"
785 ;; 807 ;;
786 808
787 games) 809 games)
788 [[ -z ${path} ]] && path=${GAMES_BINDIR}
789
790 case ${catmin} in 810 case ${catmin} in
791 action) type=ActionGame;; 811 action) type=ActionGame;;
792 arcade) type=ArcadeGame;; 812 arcade) type=ArcadeGame;;
793 board) type=BoardGame;; 813 board) type=BoardGame;;
794 kid) type=KidsGame;; 814 kid) type=KidsGame;;
835 type="Network;${type}" 855 type="Network;${type}"
836 ;; 856 ;;
837 857
838 sci) 858 sci)
839 case ${catmin} in 859 case ${catmin} in
840 astro*) type=Astronomoy;; 860 astro*) type=Astronomy;;
841 bio*) type=Biology;; 861 bio*) type=Biology;;
842 calc*) type=Calculator;; 862 calc*) type=Calculator;;
843 chem*) type=Chemistry;; 863 chem*) type=Chemistry;;
844 geo*) type=Geology;; 864 geo*) type=Geology;;
845 math*) type=Math;; 865 math*) type=Math;;
865 local desktop_name="${PN}" 885 local desktop_name="${PN}"
866 else 886 else
867 local desktop_name="${PN}-${SLOT}" 887 local desktop_name="${PN}-${SLOT}"
868 fi 888 fi
869 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 889 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
890# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
870 891
871echo "[Desktop Entry] 892echo "[Desktop Entry]
872Encoding=UTF-8 893Encoding=UTF-8
873Version=0.9.2 894Version=0.9.2
874Name=${name} 895Name=${name}
875Type=Application 896Type=Application
876Comment=${DESCRIPTION} 897Comment=${DESCRIPTION}
877Exec=${exec} 898Exec=${exec}
899TryExec=${exec%% *}
878Path=${path} 900Path=${path}
879Icon=${icon} 901Icon=${icon}
880Categories=Application;${type};" > "${desktop}" 902Categories=Application;${type};" > "${desktop}"
881 903
904 (
905 # wrap the env here so that the 'insinto' call
906 # doesn't corrupt the env of the caller
882 insinto /usr/share/applications 907 insinto /usr/share/applications
883 doins "${desktop}" 908 doins "${desktop}"
884 909 )
885 return 0
886} 910}
887 911
888# Make a GDM/KDM Session file 912# Make a GDM/KDM Session file
889# 913#
890# make_desktop_entry(<title>, <command>) 914# make_desktop_entry(<title>, <command>)
919 doins "${i}" 943 doins "${i}"
920 elif [[ -d ${i} ]] ; then 944 elif [[ -d ${i} ]] ; then
921 for j in "${i}"/*.desktop ; do 945 for j in "${i}"/*.desktop ; do
922 doins "${j}" 946 doins "${j}"
923 done 947 done
924 fi 948 fi
925 done 949 done
926} 950}
927newmenu() { 951newmenu() {
928 insinto /usr/share/applications 952 insinto /usr/share/applications
929 newins "$1" "$2" 953 newins "$1" "$2"
937 doins "${i}" 961 doins "${i}"
938 elif [[ -d ${i} ]] ; then 962 elif [[ -d ${i} ]] ; then
939 for j in "${i}"/*.png ; do 963 for j in "${i}"/*.png ; do
940 doins "${j}" 964 doins "${j}"
941 done 965 done
942 fi 966 fi
943 done 967 done
944} 968}
945newicon() { 969newicon() {
946 insinto /usr/share/pixmaps 970 insinto /usr/share/pixmaps
947 newins "$1" "$2" 971 newins "$1" "$2"
952############################################################## 976##############################################################
953 977
954 978
955# for internal use only (unpack_pdv and unpack_makeself) 979# for internal use only (unpack_pdv and unpack_makeself)
956find_unpackable_file() { 980find_unpackable_file() {
957 local src="$1" 981 local src=$1
958 if [ -z "${src}" ] 982 if [[ -z ${src} ]] ; then
959 then
960 src="${DISTDIR}/${A}" 983 src=${DISTDIR}/${A}
961 else 984 else
962 if [ -e "${DISTDIR}/${src}" ] 985 if [[ -e ${DISTDIR}/${src} ]] ; then
963 then
964 src="${DISTDIR}/${src}" 986 src=${DISTDIR}/${src}
965 elif [ -e "${PWD}/${src}" ] 987 elif [[ -e ${PWD}/${src} ]] ; then
966 then
967 src="${PWD}/${src}" 988 src=${PWD}/${src}
968 elif [ -e "${src}" ] 989 elif [[ -e ${src} ]] ; then
969 then
970 src="${src}" 990 src=${src}
971 fi
972 fi 991 fi
973 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 992 fi
993 [[ ! -e ${src} ]] && return 1
974 echo "${src}" 994 echo "${src}"
975} 995}
976 996
977# Unpack those pesky pdv generated files ... 997# Unpack those pesky pdv generated files ...
978# They're self-unpacking programs with the binary package stuffed in 998# They're self-unpacking programs with the binary package stuffed in
993# lseek 1013# lseek
994# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1014# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
995# lseek(3, -4, SEEK_END) = 2981250 1015# lseek(3, -4, SEEK_END) = 2981250
996# 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.
997unpack_pdv() { 1017unpack_pdv() {
998 local src="`find_unpackable_file $1`" 1018 local src=$(find_unpackable_file $1)
999 local sizeoff_t="$2" 1019 local sizeoff_t=$2
1000 1020
1021 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1001 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1022 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1002 1023
1003 local shrtsrc="`basename ${src}`" 1024 local shrtsrc=$(basename "${src}")
1004 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1025 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1005 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1026 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1006 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1027 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1007 1028
1008 # grab metadata for debug reasons 1029 # grab metadata for debug reasons
1072# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1093# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1073# - If the file is not specified then unpack will utilize ${A}. 1094# - If the file is not specified then unpack will utilize ${A}.
1074# - 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
1075# the proper offset from the script itself. 1096# the proper offset from the script itself.
1076unpack_makeself() { 1097unpack_makeself() {
1098 local src_input=${1:-${A}}
1077 local src="$(find_unpackable_file "$1")" 1099 local src=$(find_unpackable_file "${src_input}")
1078 local skip="$2" 1100 local skip=$2
1079 local exe="$3" 1101 local exe=$3
1080 1102
1103 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1104
1081 local shrtsrc="$(basename "${src}")" 1105 local shrtsrc=$(basename "${src}")
1082 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1106 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1083 if [ -z "${skip}" ] 1107 if [[ -z ${skip} ]] ; then
1084 then
1085 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1108 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1086 local skip=0 1109 local skip=0
1087 exe=tail 1110 exe=tail
1088 case ${ver} in 1111 case ${ver} in
1089 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
1090 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1113 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1091 ;; 1114 ;;
1092 2.0|2.0.1) 1115 2.0|2.0.1)
1093 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1116 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1094 ;; 1117 ;;
1102 ;; 1125 ;;
1103 2.1.3) 1126 2.1.3)
1104 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1127 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1105 let skip="skip + 1" 1128 let skip="skip + 1"
1106 ;; 1129 ;;
1107 2.1.4) 1130 2.1.4|2.1.5)
1108 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)
1109 skip=$(head -n ${skip} "${src}" | wc -c) 1132 skip=$(head -n ${skip} "${src}" | wc -c)
1110 exe="dd" 1133 exe="dd"
1111 ;; 1134 ;;
1112 *) 1135 *)
1157check_license() { 1180check_license() {
1158 local lic=$1 1181 local lic=$1
1159 if [ -z "${lic}" ] ; then 1182 if [ -z "${lic}" ] ; then
1160 lic="${PORTDIR}/licenses/${LICENSE}" 1183 lic="${PORTDIR}/licenses/${LICENSE}"
1161 else 1184 else
1162 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1185 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1163 lic="${PORTDIR}/licenses/${src}" 1186 lic="${PORTDIR}/licenses/${lic}"
1164 elif [ -e "${PWD}/${src}" ] ; then 1187 elif [ -e "${PWD}/${lic}" ] ; then
1165 lic="${PWD}/${src}" 1188 lic="${PWD}/${lic}"
1166 elif [ -e "${src}" ] ; then 1189 elif [ -e "${lic}" ] ; then
1167 lic="${src}" 1190 lic="${lic}"
1168 fi
1169 fi 1191 fi
1192 fi
1170 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1193 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1171 local l="`basename ${lic}`" 1194 local l="`basename ${lic}`"
1172 1195
1173 # here is where we check for the licenses the user already 1196 # here is where we check for the licenses the user already
1174 # accepted ... if we don't find a match, we make the user accept 1197 # accepted ... if we don't find a match, we make the user accept
1175 local shopts=$- 1198 local shopts=$-
1217# 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
1218# found at CDROM_ROOT. 1241# found at CDROM_ROOT.
1219# 1242#
1220# 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',
1221# 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
1222# 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_#
1223# 1250#
1224# 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.
1225# 1252#
1226# 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] [...]
1227# - 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
1231 # 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
1232 # the # of files they gave us 1259 # the # of files they gave us
1233 local cdcnt=0 1260 local cdcnt=0
1234 local f= 1261 local f=
1235 for f in "$@" ; do 1262 for f in "$@" ; do
1236 cdcnt=$((cdcnt + 1)) 1263 ((++cdcnt))
1237 export CDROM_CHECK_${cdcnt}="$f" 1264 export CDROM_CHECK_${cdcnt}="$f"
1238 done 1265 done
1239 export CDROM_TOTAL_CDS=${cdcnt} 1266 export CDROM_TOTAL_CDS=${cdcnt}
1240 export CDROM_CURRENT_CD=1 1267 export CDROM_CURRENT_CD=1
1241 1268
1242 # now we see if the user gave use CD_ROOT ... 1269 # now we see if the user gave use CD_ROOT ...
1243 # 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
1244 if [[ ! -z ${CD_ROOT} ]] ; then
1245 export CDROM_ROOT=${CD_ROOT}
1246 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1247 return
1248 fi
1249 # do the same for CD_ROOT_X
1250 if [[ ! -z ${CD_ROOT_1} ]] ; then 1271 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1251 local var= 1272 local var=
1252 cdcnt=0 1273 cdcnt=0
1253 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1274 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1254 cdcnt=$((cdcnt + 1)) 1275 ((++cdcnt))
1255 var="CD_ROOT_${cdcnt}" 1276 var="CD_ROOT_${cdcnt}"
1277 [[ -z ${!var} ]] && var="CD_ROOT"
1256 if [[ -z ${!var} ]] ; then 1278 if [[ -z ${!var} ]] ; then
1257 eerror "You must either use just the CD_ROOT" 1279 eerror "You must either use just the CD_ROOT"
1258 eerror "or specify ALL the CD_ROOT_X variables." 1280 eerror "or specify ALL the CD_ROOT_X variables."
1259 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."
1260 die "could not locate CD_ROOT_${cdcnt}" 1282 die "could not locate CD_ROOT_${cdcnt}"
1261 fi 1283 fi
1262 export CDROM_ROOTS_${cdcnt}="${!var}"
1263 done 1284 done
1264 export CDROM_ROOT=${CDROM_ROOTS_1} 1285 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1265 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}
1266 return 1293 return
1267 fi 1294 fi
1268 1295
1296 # User didn't help us out so lets make sure they know they can
1297 # simplify the whole process ...
1269 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1298 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1270 einfon "This ebuild will need the " 1299 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1271 if [[ -z ${CDROM_NAME} ]] ; then
1272 echo "cdrom for ${PN}."
1273 else
1274 echo "${CDROM_NAME}."
1275 fi
1276 echo 1300 echo
1277 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"
1278 einfo "mounted somewhere on your filesystem, just export" 1302 einfo "mounted somewhere on your filesystem, just export"
1279 einfo "the variable CD_ROOT so that it points to the" 1303 einfo "the variable CD_ROOT so that it points to the"
1280 einfo "directory containing the files." 1304 einfo "directory containing the files."
1281 echo 1305 echo
1282 einfo "For example:" 1306 einfo "For example:"
1283 einfo "export CD_ROOT=/mnt/cdrom" 1307 einfo "export CD_ROOT=/mnt/cdrom"
1284 echo 1308 echo
1285 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
1286 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1319 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1287 cdcnt=0 1320 cdcnt=0
1288 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1289 cdcnt=$((cdcnt + 1)) 1322 ((++cdcnt))
1290 var="CDROM_NAME_${cdcnt}" 1323 var="CDROM_NAME_${cdcnt}"
1291 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1324 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1292 done 1325 done
1293 echo 1326 echo
1294 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"
1295 einfo "mounted somewhere on your filesystem, just export" 1328 einfo "mounted somewhere on your filesystem, just export"
1296 einfo "the following variables so they point to the right place:" 1329 einfo "the following variables so they point to the right place:"
1297 einfon "" 1330 einfon ""
1298 cdcnt=0 1331 cdcnt=0
1299 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1332 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1300 cdcnt=$((cdcnt + 1)) 1333 ((++cdcnt))
1301 echo -n " CD_ROOT_${cdcnt}" 1334 echo -n " CD_ROOT_${cdcnt}"
1302 done 1335 done
1303 echo 1336 echo
1304 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"
1305 einfo "you only have one cdrom, you can export CD_ROOT" 1338 einfo "you only have one cdrom, you can export CD_ROOT"
1308 echo 1341 echo
1309 einfo "For example:" 1342 einfo "For example:"
1310 einfo "export CD_ROOT_1=/mnt/cdrom" 1343 einfo "export CD_ROOT_1=/mnt/cdrom"
1311 echo 1344 echo
1312 fi 1345 fi
1346
1347 export CDROM_SET=""
1313 export CDROM_CURRENT_CD=0 1348 export CDROM_CURRENT_CD=0
1314 cdrom_load_next_cd 1349 cdrom_load_next_cd
1315} 1350}
1316 1351
1317# 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.
1318# 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.
1319# 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.
1320# 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.
1321cdrom_load_next_cd() { 1356cdrom_load_next_cd() {
1322 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1323 local var= 1357 local var
1324 1358 ((++CDROM_CURRENT_CD))
1325 if [[ ! -z ${CD_ROOT} ]] ; then
1326 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1327 return
1328 fi
1329 1359
1330 unset CDROM_ROOT 1360 unset CDROM_ROOT
1331 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1361 var=CD_ROOT_${CDROM_CURRENT_CD}
1362 [[ -z ${!var} ]] && var="CD_ROOT"
1332 if [[ -z ${!var} ]] ; then 1363 if [[ -z ${!var} ]] ; then
1333 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1364 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1334 cdrom_locate_file_on_cd ${!var} 1365 _cdrom_locate_file_on_cd ${!var}
1335 else 1366 else
1336 export CDROM_ROOT=${!var} 1367 export CDROM_ROOT=${!var}
1337 fi 1368 fi
1338 1369
1339 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1370 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1344# all it does is try to locate a give file on a cd ... if the cd isn't 1375# all it does is try to locate a give file on a cd ... if the cd isn't
1345# found, then a message asking for the user to insert the cdrom will be 1376# found, then a message asking for the user to insert the cdrom will be
1346# displayed and we'll hang out here until: 1377# displayed and we'll hang out here until:
1347# (1) the file is found on a mounted cdrom 1378# (1) the file is found on a mounted cdrom
1348# (2) the user hits CTRL+C 1379# (2) the user hits CTRL+C
1349cdrom_locate_file_on_cd() { 1380_cdrom_locate_file_on_cd() {
1381 local mline=""
1382 local showedmsg=0
1383
1350 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
1351 local dir="$(dirname ${@})" 1392 local dir=$(dirname ${cdset[${i}]})
1352 local file="$(basename ${@})" 1393 local file=$(basename ${cdset[${i}]})
1353 local mline=""
1354 local showedmsg=0
1355 1394
1356 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
1357 [[ -d ${mline}/${dir} ]] || continue 1396 [[ -d ${mline}/${dir} ]] || continue
1358 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1397 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1359 && 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))
1360 done 1406 done
1361 1407
1362 if [[ -z ${CDROM_ROOT} ]] ; then
1363 echo 1408 echo
1364 if [[ ${showedmsg} -eq 0 ]] ; then 1409 if [[ ${showedmsg} -eq 0 ]] ; then
1365 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1410 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1366 if [[ -z ${CDROM_NAME} ]] ; then 1411 if [[ -z ${CDROM_NAME} ]] ; then
1367 einfo "Please insert the cdrom for ${PN} now !" 1412 einfo "Please insert+mount the cdrom for ${PN} now !"
1368 else
1369 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1370 fi
1371 else 1413 else
1372 if [[ -z ${CDROM_NAME_1} ]] ; then
1373 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1374 else
1375 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1376 einfo "Please insert+mount the ${!var} cdrom now !" 1414 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1377 fi
1378 fi 1415 fi
1379 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
1380 fi 1423 fi
1424 showedmsg=1
1425 fi
1381 einfo "Press return to scan for the cd again" 1426 einfo "Press return to scan for the cd again"
1382 einfo "or hit CTRL+C to abort the emerge." 1427 einfo "or hit CTRL+C to abort the emerge."
1383 read 1428 echo
1384 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"
1385 done 1434 done
1386} 1435}
1387 1436
1388# Make sure that LINGUAS only contains languages that 1437# Make sure that LINGUAS only contains languages that
1389# a package can support 1438# a package can support
1396# 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
1397# directories and uses the intersection of the lists. 1446# directories and uses the intersection of the lists.
1398# 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
1399# directories and uses the union of the lists. 1448# directories and uses the union of the lists.
1400strip-linguas() { 1449strip-linguas() {
1401 local ls newls 1450 local ls newls nols
1402 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1451 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1403 local op=$1; shift 1452 local op=$1; shift
1404 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1453 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1405 local d f 1454 local d f
1406 for d in "$@" ; do 1455 for d in "$@" ; do
1407 if [[ ${op} == "-u" ]] ; then 1456 if [[ ${op} == "-u" ]] ; then
1408 newls=${ls} 1457 newls=${ls}
1409 else 1458 else
1410 newls="" 1459 newls=""
1411 fi 1460 fi
1412 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1461 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1413 if [[ ${op} == "-i" ]] ; then 1462 if [[ ${op} == "-i" ]] ; then
1414 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1463 hasq ${f} ${ls} && newls="${newls} ${f}"
1415 else 1464 else
1416 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1465 hasq ${f} ${ls} || newls="${newls} ${f}"
1417 fi 1466 fi
1418 done 1467 done
1419 ls=${newls} 1468 ls=${newls}
1420 done 1469 done
1421 ls=${ls//.po}
1422 else 1470 else
1423 ls=$@ 1471 ls="$@"
1424 fi 1472 fi
1425 1473
1426 ls=" ${ls} " 1474 nols=""
1427 newls="" 1475 newls=""
1428 for f in ${LINGUAS} ; do 1476 for f in ${LINGUAS} ; do
1429 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1477 if hasq ${f} ${ls} ; then
1430 newls="${newls} ${f}" 1478 newls="${newls} ${f}"
1431 else 1479 else
1432 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1480 nols="${nols} ${f}"
1433 fi 1481 fi
1434 done 1482 done
1435 if [[ -z ${newls} ]] ; then 1483 [[ -n ${nols} ]] \
1436 export LINGUAS="" 1484 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1437 else
1438 export LINGUAS=${newls:1} 1485 export LINGUAS=${newls:1}
1439 fi
1440} 1486}
1441 1487
1442# moved from kernel.eclass since they are generally useful outside of 1488# moved from kernel.eclass since they are generally useful outside of
1443# kernel.eclass -iggy (20041002) 1489# kernel.eclass -iggy (20041002)
1444 1490
1473 1519
1474# Jeremy Huddleston <eradicator@gentoo.org>: 1520# Jeremy Huddleston <eradicator@gentoo.org>:
1475# preserve_old_lib /path/to/libblah.so.0 1521# preserve_old_lib /path/to/libblah.so.0
1476# preserve_old_lib_notify /path/to/libblah.so.0 1522# preserve_old_lib_notify /path/to/libblah.so.0
1477# 1523#
1478# 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
1479# 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
1480# 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
1481# 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
1482# solution, so instead you can add the following to your ebuilds: 1528# solution, so instead you can add the following to your ebuilds:
1483# 1529#
1510 LIB=$1 1556 LIB=$1
1511 1557
1512 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1558 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1513 SONAME=`basename ${LIB}` 1559 SONAME=`basename ${LIB}`
1514 1560
1515 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."
1516 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"
1517 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,"
1518 einfo "you will need to execute the following command:" 1564 ewarn "you will need to execute the following command:"
1519 einfo " revdep-rebuild --soname ${SONAME}" 1565 ewarn " revdep-rebuild --library ${SONAME}"
1520 einfo 1566 ewarn
1521 einfo "After doing that, you can safely remove ${LIB}" 1567 ewarn "After doing that, you can safely remove ${LIB}"
1522 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1568 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1523 fi 1569 fi
1524} 1570}
1525 1571
1526# 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
1527# certain USE flags 1573# certain USE flags
1535built_with_use() { 1581built_with_use() {
1536 local opt=$1 1582 local opt=$1
1537 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1583 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1538 1584
1539 local PKG=$(best_version $1) 1585 local PKG=$(best_version $1)
1586 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1540 shift 1587 shift
1541 1588
1542 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1589 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1543 [[ ! -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"
1544 1594
1545 local USE_BUILT=$(<${USEFILE}) 1595 local USE_BUILT=$(<${USEFILE})
1546 while [[ $# -gt 0 ]] ; do 1596 while [[ $# -gt 0 ]] ; do
1547 if [[ ${opt} = "-o" ]] ; then 1597 if [[ ${opt} = "-o" ]] ; then
1548 has $1 ${USE_BUILT} && return 0 1598 has $1 ${USE_BUILT} && return 0
1600# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1650# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1601# $5 == path for wrapper 1651# $5 == path for wrapper
1602make_wrapper() { 1652make_wrapper() {
1603 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1653 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1604 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"
1605 cat << EOF > "${tmpwrapper}" 1657 cat << EOF > "${tmpwrapper}"
1606#!/bin/sh 1658#!/bin/sh
1607cd "${chdir}" 1659cd "${chdir:-.}"
1660if [ -n "${libdir}" ] ; then
1661 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1608export 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
1609exec ${bin} "\$@" 1667exec ${bin} "\$@"
1610EOF 1668EOF
1611 chmod go+rx "${tmpwrapper}" 1669 chmod go+rx "${tmpwrapper}"
1612 if [ -n "${5}" ] 1670 if [[ -n ${path} ]] ; then
1613 then
1614 exeinto ${5} 1671 exeinto "${path}"
1615 newexe "${tmpwrapper}" "${wrapper}" 1672 newexe "${tmpwrapper}" "${wrapper}"
1616 else 1673 else
1617 newbin "${tmpwrapper}" "${wrapper}" 1674 newbin "${tmpwrapper}" "${wrapper}"
1618 fi 1675 fi
1619} 1676}

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

  ViewVC Help
Powered by ViewVC 1.1.20