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

Diff of /eclass/eutils.eclass

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

Revision 1.173 Revision 1.237
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.173 2005/05/24 03:17:19 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.237 2006/06/04 15:18:12 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!
11 9
12inherit multilib 10inherit multilib portability
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15 11
16DEPEND="!bootstrap? ( sys-devel/patch )" 12DEPEND="!bootstrap? ( sys-devel/patch )"
13RDEPEND=""
14# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 15
18DESCRIPTION="Based on the ${ECLASS} eclass" 16DESCRIPTION="Based on the ${ECLASS} eclass"
19 17
20# Wait for the supplied number of seconds. If no argument is supplied, defaults 18# 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 19# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
61# to point to the latest version of the library present. 59# to point to the latest version of the library present.
62# 60#
63# <azarah@gentoo.org> (26 Oct 2002) 61# <azarah@gentoo.org> (26 Oct 2002)
64# 62#
65gen_usr_ldscript() { 63gen_usr_ldscript() {
66 local libdir="$(get_libdir)" 64 local lib libdir=$(get_libdir)
67 # Just make sure it exists 65 # Just make sure it exists
68 dodir /usr/${libdir} 66 dodir /usr/${libdir}
69 67
70 for lib in "${@}" ; do 68 for lib in "${@}" ; do
71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 69 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
72 /* GNU ld script 70 /* GNU ld script
73 Since Gentoo has critical dynamic libraries 71 Since Gentoo has critical dynamic libraries
74 in /lib, and the static versions in /usr/lib, 72 in /lib, and the static versions in /usr/lib,
75 we need to have a "fake" dynamic lib in /usr/lib, 73 we need to have a "fake" dynamic lib in /usr/lib,
76 otherwise we run into linking problems. 74 otherwise we run into linking problems.
77 75
78 See bug http://bugs.gentoo.org/4411 for more info. 76 See bug http://bugs.gentoo.org/4411 for more info.
79 */ 77 */
80 GROUP ( /${libdir}/${lib} ) 78 GROUP ( /${libdir}/${lib} )
81 END_LDSCRIPT 79 END_LDSCRIPT
82 fperms a+x "/usr/${libdir}/${lib}" 80 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
83 done 81 done
84} 82}
85 83
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 84
117# Default directory where patches are located 85# Default directory where patches are located
118EPATCH_SOURCE="${WORKDIR}/patch" 86EPATCH_SOURCE="${WORKDIR}/patch"
119# Default extension for patches 87# Default extension for patches
120EPATCH_SUFFIX="patch.bz2" 88EPATCH_SUFFIX="patch.bz2"
121# Default options for patch 89# Default options for patch
122# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 90# 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. 91# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
92# Set -E to automatically remove empty files.
124EPATCH_OPTS="-g0 --no-backup-if-mismatch" 93EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
125# List of patches not to apply. Not this is only file names, 94# List of patches not to apply. Not this is only file names,
126# and not the full path .. 95# and not the full path ..
127EPATCH_EXCLUDE="" 96EPATCH_EXCLUDE=""
128# Change the printed message for a single patch. 97# Change the printed message for a single patch.
129EPATCH_SINGLE_MSG="" 98EPATCH_SINGLE_MSG=""
167# hand its a directory, it will set EPATCH_SOURCE to this. 136# hand its a directory, it will set EPATCH_SOURCE to this.
168# 137#
169# <azarah@gentoo.org> (10 Nov 2002) 138# <azarah@gentoo.org> (10 Nov 2002)
170# 139#
171epatch() { 140epatch() {
141 _epatch_draw_line() {
142 [[ -z $1 ]] && set "$(printf "%65s" '')"
143 echo "${1//?/=}"
144 }
145 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
172 local PIPE_CMD="" 146 local PIPE_CMD=""
173 local STDERR_TARGET="${T}/$$.out" 147 local STDERR_TARGET="${T}/$$.out"
174 local PATCH_TARGET="${T}/$$.patch" 148 local PATCH_TARGET="${T}/$$.patch"
175 local PATCH_SUFFIX="" 149 local PATCH_SUFFIX=""
176 local SINGLE_PATCH="no" 150 local SINGLE_PATCH="no"
177 local x="" 151 local x=""
152
153 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
178 154
179 if [ "$#" -gt 1 ] 155 if [ "$#" -gt 1 ]
180 then 156 then
181 local m="" 157 local m=""
182 for m in "$@" ; do 158 for m in "$@" ; do
249 # New ARCH dependant patch naming scheme ... 225 # New ARCH dependant patch naming scheme ...
250 # 226 #
251 # ???_arch_foo.patch 227 # ???_arch_foo.patch
252 # 228 #
253 if [ -f ${x} ] && \ 229 if [ -f ${x} ] && \
254 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 230 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
255 [ "${EPATCH_FORCE}" = "yes" ]) 231 [ "${EPATCH_FORCE}" = "yes" ])
256 then 232 then
257 local count=0 233 local count=0
258 local popts="${EPATCH_OPTS}" 234 local popts="${EPATCH_OPTS}"
259 local patchname=${x##*/} 235 local patchname=${x##*/}
283 259
284 # Allow for prefix to differ ... im lazy, so shoot me :/ 260 # Allow for prefix to differ ... im lazy, so shoot me :/
285 while [ "${count}" -lt 5 ] 261 while [ "${count}" -lt 5 ]
286 do 262 do
287 # Generate some useful debug info ... 263 # Generate some useful debug info ...
288 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 264 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
289 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 265 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290 266
291 if [ "${PATCH_SUFFIX}" != "patch" ] 267 if [ "${PATCH_SUFFIX}" != "patch" ]
292 then 268 then
293 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
298 274
299 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 275 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
300 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 276 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 277
302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 278 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
303 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
304 280
305 if [ "${PATCH_SUFFIX}" != "patch" ] 281 if [ "${PATCH_SUFFIX}" != "patch" ]
306 then 282 then
307 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 283 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
308 then 284 then
312 count=5 288 count=5
313 break 289 break
314 fi 290 fi
315 fi 291 fi
316 292
317 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 293 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
318 then 294 then
319 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 295 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 296 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 297 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 298 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 299 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 300
325 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 301 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
302 _epatch_assert
326 303
327 if [ "$?" -ne 0 ] 304 if [ "$?" -ne 0 ]
328 then 305 then
329 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 306 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
330 echo 307 echo
369 then 346 then
370 einfo "Done with patching" 347 einfo "Done with patching"
371 fi 348 fi
372} 349}
373 350
374# This function check how many cpu's are present, and then set
375# -j in MAKEOPTS accordingly.
376#
377# Thanks to nall <nall@gentoo.org> for this.
378#
379get_number_of_jobs() {
380 local jobs=0
381
382 if [ ! -r /proc/cpuinfo ]
383 then
384 return 1
385 fi
386
387 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
388 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
389 then
390 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
391 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
392 ADMINPARAM="${ADMINPARAM/-j}"
393 fi
394
395 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
396
397 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
398 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
399 then
400 # these archs will always have "[Pp]rocessor"
401 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
402
403 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
404 then
405 # sparc always has "ncpus active"
406 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
407
408 elif [ "${ARCH}" = "alpha" ]
409 then
410 # alpha has "cpus active", but only when compiled with SMP
411 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
412 then
413 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
414 else
415 jobs=2
416 fi
417
418 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
419 then
420 # ppc has "processor", but only when compiled with SMP
421 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
422 then
423 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
424 else
425 jobs=2
426 fi
427 elif [ "${ARCH}" = "s390" ]
428 then
429 # s390 has "# processors : "
430 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
431 else
432 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
433 die "Unknown ARCH -- ${ARCH}!"
434 fi
435
436 # Make sure the number is valid ...
437 if [ "${jobs}" -lt 1 ]
438 then
439 jobs=1
440 fi
441
442 if [ -n "${ADMINPARAM}" ]
443 then
444 if [ "${jobs}" -gt "${ADMINPARAM}" ]
445 then
446 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
447 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
448 else
449 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
450 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
451 fi
452 fi
453}
454
455# Cheap replacement for when debianutils (and thus mktemp) 351# Cheap replacement for when debianutils (and thus mktemp)
456# does not exist on the users system 352# does not exist on the users system
457# vapier@gentoo.org 353# vapier@gentoo.org
458# 354#
459# Takes just 1 optional parameter (the directory to create tmpfile in) 355# Takes just 1 optional parameter (the directory to create tmpfile in)
460emktemp() { 356emktemp() {
461 local exe="touch" 357 local exe="touch"
462 [ "$1" == "-d" ] && exe="mkdir" && shift 358 [[ $1 == -d ]] && exe="mkdir" && shift
463 local topdir="$1" 359 local topdir=$1
464 360
465 if [ -z "${topdir}" ] 361 if [[ -z ${topdir} ]] ; then
466 then
467 [ -z "${T}" ] \ 362 [[ -z ${T} ]] \
468 && topdir="/tmp" \ 363 && topdir="/tmp" \
469 || topdir="${T}" 364 || topdir=${T}
470 fi 365 fi
471 366
472 if [ -z "$(type -p mktemp)" ] 367 if [[ -z $(type -p mktemp) ]] ; then
473 then
474 local tmp=/ 368 local tmp=/
475 while [ -e "${tmp}" ] ; do 369 while [[ -e ${tmp} ]] ; do
476 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 370 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
477 done 371 done
478 ${exe} "${tmp}" 372 ${exe} "${tmp}" || ${exe} -p "${tmp}"
479 echo "${tmp}" 373 echo "${tmp}"
480 else 374 else
481 [ "${exe}" == "touch" ] \ 375 if [[ ${exe} == "touch" ]] ; then
482 && exe="-p" \ 376 [[ ${USERLAND} == "GNU" ]] \
483 || exe="-d" 377 && mktemp -p "${topdir}" \
484 mktemp ${exe} "${topdir}" 378 || TMPDIR="${topdir}" mktemp -t tmp
379 else
380 [[ ${USERLAND} == "GNU" ]] \
381 && mktemp -d "${topdir}" \
382 || TMPDIR="${topdir}" mktemp -dt tmp
383 fi
485 fi 384 fi
486} 385}
487 386
488# Small wrapper for getent (Linux), nidump (Mac OS X), 387# Small wrapper for getent (Linux), nidump (Mac OS X),
489# and pw (FreeBSD) used in enewuser()/enewgroup() 388# and pw (FreeBSD) used in enewuser()/enewgroup()
490# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 389# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
491# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 390# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
492# 391#
493# egetent(database, key) 392# egetent(database, key)
494egetent() { 393egetent() {
495 if useq ppc-macos ; then 394 case ${CHOST} in
395 *-darwin*)
496 case "$2" in 396 case "$2" in
497 *[!0-9]*) # Non numeric 397 *[!0-9]*) # Non numeric
498 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 398 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
499 ;; 399 ;;
500 *) # Numeric 400 *) # Numeric
501 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 401 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
502 ;; 402 ;;
503 esac 403 esac
504 elif useq x86-fbsd ; then 404 ;;
505 local action 405 *-freebsd*|*-dragonfly*)
506 if [ "$1" == "passwd" ] 406 local opts action="user"
507 then 407 [[ $1 == "passwd" ]] || action="group"
508 action="user" 408
509 else 409 # lookup by uid/gid
510 action="group" 410 if [[ $2 == [[:digit:]]* ]] ; then
411 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
511 fi 412 fi
413
512 pw show "${action}" "$2" -q 414 pw show ${action} ${opts} "$2" -q
513 else 415 ;;
416 *-netbsd*|*-openbsd*)
417 grep "$2:\*:" /etc/$1
418 ;;
419 *)
514 which nscd >& /dev/null && nscd -i "$1" 420 type -p nscd >& /dev/null && nscd -i "$1"
515 getent "$1" "$2" 421 getent "$1" "$2"
516 fi 422 ;;
423 esac
517} 424}
518 425
519# Simplify/standardize adding users to the system 426# Simplify/standardize adding users to the system
520# vapier@gentoo.org 427# vapier@gentoo.org
521# 428#
528# shell: /bin/false 435# shell: /bin/false
529# homedir: /dev/null 436# homedir: /dev/null
530# groups: none 437# groups: none
531# extra: comment of 'added by portage for ${PN}' 438# extra: comment of 'added by portage for ${PN}'
532enewuser() { 439enewuser() {
440 case ${EBUILD_PHASE} in
441 unpack|compile|test|install)
442 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
443 eerror "Package fails at QA and at life. Please file a bug."
444 die "Bad package! enewuser is only for use in pkg_* functions!"
445 esac
446
533 # get the username 447 # get the username
534 local euser="$1"; shift 448 local euser=$1; shift
535 if [ -z "${euser}" ] 449 if [[ -z ${euser} ]] ; then
536 then
537 eerror "No username specified !" 450 eerror "No username specified !"
538 die "Cannot call enewuser without a username" 451 die "Cannot call enewuser without a username"
539 fi 452 fi
540 453
541 # lets see if the username already exists 454 # lets see if the username already exists
542 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 455 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
543 then
544 return 0 456 return 0
545 fi 457 fi
546 einfo "Adding user '${euser}' to your system ..." 458 einfo "Adding user '${euser}' to your system ..."
547 459
548 # options to pass to useradd 460 # options to pass to useradd
549 local opts= 461 local opts=
550 462
551 # handle uid 463 # handle uid
552 local euid="$1"; shift 464 local euid=$1; shift
553 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 465 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
554 then
555 if [ "${euid}" -gt 0 ] 466 if [[ ${euid} -gt 0 ]] ; then
556 then
557 if [ ! -z "`egetent passwd ${euid}`" ] 467 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
558 then
559 euid="next" 468 euid="next"
560 fi 469 fi
561 else 470 else
562 eerror "Userid given but is not greater than 0 !" 471 eerror "Userid given but is not greater than 0 !"
563 die "${euid} is not a valid UID" 472 die "${euid} is not a valid UID"
564 fi 473 fi
565 else 474 else
566 euid="next" 475 euid="next"
567 fi 476 fi
568 if [ "${euid}" == "next" ] 477 if [[ ${euid} == "next" ]] ; then
569 then 478 for euid in $(seq 101 999) ; do
570 local pwrange
571 if [ "${USERLAND}" == "BSD" ] ; then
572 pwrange="`jot 898 101`"
573 else
574 pwrange="`seq 101 999`"
575 fi
576 for euid in ${pwrange} ; do
577 [ -z "`egetent passwd ${euid}`" ] && break 479 [[ -z $(egetent passwd ${euid}) ]] && break
578 done 480 done
579 fi 481 fi
580 opts="${opts} -u ${euid}" 482 opts="${opts} -u ${euid}"
581 einfo " - Userid: ${euid}" 483 einfo " - Userid: ${euid}"
582 484
583 # handle shell 485 # handle shell
584 local eshell="$1"; shift 486 local eshell=$1; shift
585 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 487 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
586 then 488 if [[ ! -e ${ROOT}${eshell} ]] ; then
587 if [ ! -e "${eshell}" ]
588 then
589 eerror "A shell was specified but it does not exist !" 489 eerror "A shell was specified but it does not exist !"
590 die "${eshell} does not exist" 490 die "${eshell} does not exist in ${ROOT}"
491 fi
492 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
493 eerror "Do not specify ${eshell} yourself, use -1"
494 die "Pass '-1' as the shell parameter"
591 fi 495 fi
592 else 496 else
593 if [ "${USERLAND}" == "BSD" ] 497 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
594 then 498 [[ -x ${ROOT}${shell} ]] && break
595 eshell="/usr/bin/false" 499 done
596 else 500
597 eshell="/bin/false" 501 if [[ ${shell} == "/dev/null" ]] ; then
502 eerror "Unable to identify the shell to use"
503 die "Unable to identify the shell to use"
598 fi 504 fi
505
506 eshell=${shell}
599 fi 507 fi
600 einfo " - Shell: ${eshell}" 508 einfo " - Shell: ${eshell}"
601 opts="${opts} -s ${eshell}" 509 opts="${opts} -s ${eshell}"
602 510
603 # handle homedir 511 # handle homedir
604 local ehome="$1"; shift 512 local ehome=$1; shift
605 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 513 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
606 then
607 ehome="/dev/null" 514 ehome="/dev/null"
608 fi 515 fi
609 einfo " - Home: ${ehome}" 516 einfo " - Home: ${ehome}"
610 opts="${opts} -d ${ehome}" 517 opts="${opts} -d ${ehome}"
611 518
612 # handle groups 519 # handle groups
613 local egroups="$1"; shift 520 local egroups=$1; shift
614 if [ ! -z "${egroups}" ] 521 if [[ ! -z ${egroups} ]] ; then
615 then
616 local oldifs="${IFS}" 522 local oldifs=${IFS}
617 local defgroup="" exgroups="" 523 local defgroup="" exgroups=""
618 524
619 export IFS="," 525 export IFS=","
620 for g in ${egroups} 526 for g in ${egroups} ; do
621 do
622 export IFS="${oldifs}" 527 export IFS=${oldifs}
623 if [ -z "`egetent group \"${g}\"`" ] 528 if [[ -z $(egetent group "${g}") ]] ; then
624 then
625 eerror "You must add group ${g} to the system first" 529 eerror "You must add group ${g} to the system first"
626 die "${g} is not a valid GID" 530 die "${g} is not a valid GID"
627 fi 531 fi
628 if [ -z "${defgroup}" ] 532 if [[ -z ${defgroup} ]] ; then
629 then
630 defgroup="${g}" 533 defgroup=${g}
631 else 534 else
632 exgroups="${exgroups},${g}" 535 exgroups="${exgroups},${g}"
633 fi 536 fi
634 export IFS="," 537 export IFS=","
635 done 538 done
636 export IFS="${oldifs}" 539 export IFS=${oldifs}
637 540
638 opts="${opts} -g ${defgroup}" 541 opts="${opts} -g ${defgroup}"
639 if [ ! -z "${exgroups}" ] 542 if [[ ! -z ${exgroups} ]] ; then
640 then
641 opts="${opts} -G ${exgroups:1}" 543 opts="${opts} -G ${exgroups:1}"
642 fi 544 fi
643 else 545 else
644 egroups="(none)" 546 egroups="(none)"
645 fi 547 fi
646 einfo " - Groups: ${egroups}" 548 einfo " - Groups: ${egroups}"
647 549
648 # handle extra and add the user 550 # handle extra and add the user
649 local eextra="$@"
650 local oldsandbox="${SANDBOX_ON}" 551 local oldsandbox=${SANDBOX_ON}
651 export SANDBOX_ON="0" 552 export SANDBOX_ON="0"
652 if useq ppc-macos 553 case ${CHOST} in
653 then 554 *-darwin*)
654 ### Make the user 555 ### Make the user
655 if [ -z "${eextra}" ] 556 if [[ -z $@ ]] ; then
656 then
657 dscl . create /users/${euser} uid ${euid} 557 dscl . create /users/${euser} uid ${euid}
658 dscl . create /users/${euser} shell ${eshell} 558 dscl . create /users/${euser} shell ${eshell}
659 dscl . create /users/${euser} home ${ehome} 559 dscl . create /users/${euser} home ${ehome}
660 dscl . create /users/${euser} realname "added by portage for ${PN}" 560 dscl . create /users/${euser} realname "added by portage for ${PN}"
661 ### Add the user to the groups specified 561 ### Add the user to the groups specified
662 local oldifs="${IFS}" 562 local oldifs=${IFS}
663 export IFS="," 563 export IFS=","
664 for g in ${egroups} 564 for g in ${egroups} ; do
665 do
666 dscl . merge /groups/${g} users ${euser} 565 dscl . merge /groups/${g} users ${euser}
667 done 566 done
668 export IFS="${oldifs}" 567 export IFS=${oldifs}
669 else 568 else
670 einfo "Extra options are not supported on macos yet" 569 einfo "Extra options are not supported on Darwin yet"
671 einfo "Please report the ebuild along with the info below" 570 einfo "Please report the ebuild along with the info below"
672 einfo "eextra: ${eextra}" 571 einfo "eextra: $@"
673 die "Required function missing" 572 die "Required function missing"
674 fi 573 fi
675 elif use x86-fbsd ; then 574 ;;
676 if [ -z "${eextra}" ] 575 *-freebsd*|*-dragonfly*)
677 then 576 if [[ -z $@ ]] ; then
678 pw useradd ${euser} ${opts} \ 577 pw useradd ${euser} ${opts} \
679 -c "added by portage for ${PN}" \ 578 -c "added by portage for ${PN}" \
680 die "enewuser failed" 579 die "enewuser failed"
681 else 580 else
682 einfo " - Extra: ${eextra}" 581 einfo " - Extra: $@"
683 pw useradd ${euser} ${opts} \ 582 pw useradd ${euser} ${opts} \
684 -c ${eextra} || die "enewuser failed" 583 "$@" || die "enewuser failed"
685 fi 584 fi
585 ;;
586
587 *-netbsd*)
588 if [[ -z $@ ]] ; then
589 useradd ${opts} ${euser} || die "enewuser failed"
686 else 590 else
687 if [ -z "${eextra}" ] 591 einfo " - Extra: $@"
688 then 592 useradd ${opts} ${euser} "$@" || die "enewuser failed"
593 fi
594 ;;
595
596 *-openbsd*)
597 if [[ -z $@ ]] ; then
598 useradd -u ${euid} -s ${eshell} \
599 -d ${ehome} -c "Added by portage for ${PN}" \
600 -g ${egroups} ${euser} || die "enewuser failed"
601 else
602 einfo " - Extra: $@"
603 useradd -u ${euid} -s ${eshell} \
604 -d ${ehome} -c "Added by portage for ${PN}" \
605 -g ${egroups} ${euser} "$@" || die "enewuser failed"
606 fi
607 ;;
608
609 *)
610 if [[ -z $@ ]] ; then
689 useradd ${opts} ${euser} \ 611 useradd ${opts} ${euser} \
690 -c "added by portage for ${PN}" \ 612 -c "added by portage for ${PN}" \
691 || die "enewuser failed" 613 || die "enewuser failed"
692 else 614 else
693 einfo " - Extra: ${eextra}" 615 einfo " - Extra: $@"
694 useradd ${opts} ${euser} ${eextra} \ 616 useradd ${opts} ${euser} "$@" \
695 || die "enewuser failed" 617 || die "enewuser failed"
696 fi 618 fi
619 ;;
620 esac
621
622 if [[ ! -e ${ROOT}/${ehome} ]] ; then
623 einfo " - Creating ${ehome} in ${ROOT}"
624 mkdir -p "${ROOT}/${ehome}"
625 chown ${euser} "${ROOT}/${ehome}"
626 chmod 755 "${ROOT}/${ehome}"
697 fi 627 fi
628
698 export SANDBOX_ON="${oldsandbox}" 629 export SANDBOX_ON=${oldsandbox}
699
700 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
701 then
702 einfo " - Creating ${ehome} in ${D}"
703 dodir ${ehome}
704 fowners ${euser} ${ehome}
705 fperms 755 ${ehome}
706 fi
707} 630}
708 631
709# Simplify/standardize adding groups to the system 632# Simplify/standardize adding groups to the system
710# vapier@gentoo.org 633# vapier@gentoo.org
711# 634#
714# Default values if you do not specify any: 637# Default values if you do not specify any:
715# groupname: REQUIRED ! 638# groupname: REQUIRED !
716# gid: next available (see groupadd(8)) 639# gid: next available (see groupadd(8))
717# extra: none 640# extra: none
718enewgroup() { 641enewgroup() {
642 case ${EBUILD_PHASE} in
643 unpack|compile|test|install)
644 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
645 eerror "Package fails at QA and at life. Please file a bug."
646 die "Bad package! enewgroup is only for use in pkg_* functions!"
647 esac
648
719 # get the group 649 # get the group
720 local egroup="$1"; shift 650 local egroup="$1"; shift
721 if [ -z "${egroup}" ] 651 if [ -z "${egroup}" ]
722 then 652 then
723 eerror "No group specified !" 653 eerror "No group specified !"
740 then 670 then
741 if [ "${egid}" -gt 0 ] 671 if [ "${egid}" -gt 0 ]
742 then 672 then
743 if [ -z "`egetent group ${egid}`" ] 673 if [ -z "`egetent group ${egid}`" ]
744 then 674 then
745 if useq ppc-macos ; then 675 if [[ "${CHOST}" == *-darwin* ]]; then
746 opts="${opts} ${egid}" 676 opts="${opts} ${egid}"
747 else 677 else
748 opts="${opts} -g ${egid}" 678 opts="${opts} -g ${egid}"
749 fi 679 fi
750 else 680 else
764 opts="${opts} ${eextra}" 694 opts="${opts} ${eextra}"
765 695
766 # add the group 696 # add the group
767 local oldsandbox="${SANDBOX_ON}" 697 local oldsandbox="${SANDBOX_ON}"
768 export SANDBOX_ON="0" 698 export SANDBOX_ON="0"
769 if useq ppc-macos ; then 699 case ${CHOST} in
700 *-darwin*)
770 if [ ! -z "${eextra}" ]; 701 if [ ! -z "${eextra}" ];
771 then 702 then
772 einfo "Extra options are not supported on macos yet" 703 einfo "Extra options are not supported on Darwin/OS X yet"
773 einfo "Please report the ebuild along with the info below" 704 einfo "Please report the ebuild along with the info below"
774 einfo "eextra: ${eextra}" 705 einfo "eextra: ${eextra}"
775 die "Required function missing" 706 die "Required function missing"
776 fi 707 fi
777 708
778 # If we need the next available 709 # If we need the next available
779 case ${egid} in 710 case ${egid} in
780 *[!0-9]*) # Non numeric 711 *[!0-9]*) # Non numeric
781 for egid in `jot 898 101`; do 712 for egid in $(seq 101 999); do
782 [ -z "`egetent group ${egid}`" ] && break 713 [ -z "`egetent group ${egid}`" ] && break
783 done 714 done
784 esac 715 esac
785 dscl . create /groups/${egroup} gid ${egid} 716 dscl . create /groups/${egroup} gid ${egid}
786 dscl . create /groups/${egroup} passwd '*' 717 dscl . create /groups/${egroup} passwd '*'
787 elif use x86-fbsd ; then 718 ;;
719
720 *-freebsd*|*-dragonfly*)
788 case ${egid} in 721 case ${egid} in
789 *[!0-9]*) # Non numeric 722 *[!0-9]*) # Non numeric
790 for egid in `jot 898 101`; do 723 for egid in $(seq 101 999); do
791 [ -z "`egetent group ${egid}`" ] && break 724 [ -z "`egetent group ${egid}`" ] && break
792 done 725 done
793 esac 726 esac
794 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 727 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
795 else 728 ;;
729
730 *-netbsd*)
731 case ${egid} in
732 *[!0-9]*) # Non numeric
733 for egid in $(seq 101 999); do
734 [ -z "`egetent group ${egid}`" ] && break
735 done
736 esac
737 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
738 ;;
739
740 *)
796 groupadd ${opts} ${egroup} || die "enewgroup failed" 741 groupadd ${opts} ${egroup} || die "enewgroup failed"
797 fi 742 ;;
743 esac
798 export SANDBOX_ON="${oldsandbox}" 744 export SANDBOX_ON="${oldsandbox}"
799} 745}
800 746
801# Simple script to replace 'dos2unix' binaries 747# Simple script to replace 'dos2unix' binaries
802# vapier@gentoo.org 748# vapier@gentoo.org
827# name: the name that will show up in the menu 773# name: the name that will show up in the menu
828# icon: give your little like a pretty little icon ... 774# icon: give your little like a pretty little icon ...
829# this can be relative (to /usr/share/pixmaps) or 775# this can be relative (to /usr/share/pixmaps) or
830# a full path to an icon 776# a full path to an icon
831# type: what kind of application is this ? for categories: 777# type: what kind of application is this ? for categories:
832# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 778# http://www.freedesktop.org/Standards/desktop-entry-spec
833# path: if your app needs to startup in a specific dir 779# path: if your app needs to startup in a specific dir
834make_desktop_entry() { 780make_desktop_entry() {
835 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 781 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
836 782
837 local exec=${1} 783 local exec=${1}
863 dev) 809 dev)
864 type="Development" 810 type="Development"
865 ;; 811 ;;
866 812
867 games) 813 games)
868 [[ -z ${path} ]] && path=${GAMES_BINDIR}
869
870 case ${catmin} in 814 case ${catmin} in
871 action) type=ActionGame;; 815 action) type=ActionGame;;
872 arcade) type=ArcadeGame;; 816 arcade) type=ArcadeGame;;
873 board) type=BoardGame;; 817 board) type=BoardGame;;
874 kid) type=KidsGame;; 818 kid) type=KidsGame;;
915 type="Network;${type}" 859 type="Network;${type}"
916 ;; 860 ;;
917 861
918 sci) 862 sci)
919 case ${catmin} in 863 case ${catmin} in
920 astro*) type=Astronomoy;; 864 astro*) type=Astronomy;;
921 bio*) type=Biology;; 865 bio*) type=Biology;;
922 calc*) type=Calculator;; 866 calc*) type=Calculator;;
923 chem*) type=Chemistry;; 867 chem*) type=Chemistry;;
924 geo*) type=Geology;; 868 geo*) type=Geology;;
925 math*) type=Math;; 869 math*) type=Math;;
939 *) 883 *)
940 type= 884 type=
941 ;; 885 ;;
942 esac 886 esac
943 fi 887 fi
944 888 if [ "${SLOT}" == "0" ] ; then
889 local desktop_name="${PN}"
890 else
891 local desktop_name="${PN}-${SLOT}"
892 fi
945 local desktop=${T}/${exec%% *}-${P}.desktop 893 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
894# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
946 895
947echo "[Desktop Entry] 896echo "[Desktop Entry]
948Encoding=UTF-8 897Encoding=UTF-8
949Version=0.9.2 898Version=0.9.2
950Name=${name} 899Name=${name}
951Type=Application 900Type=Application
952Comment=${DESCRIPTION} 901Comment=${DESCRIPTION}
953Exec=${exec} 902Exec=${exec}
903TryExec=${exec}
954Path=${path} 904Path=${path}
955Icon=${icon} 905Icon=${icon}
956Categories=Application;${type};" > "${desktop}" 906Categories=Application;${type};" > "${desktop}"
957 907
908 (
909 # wrap the env here so that the 'insinto' call
910 # doesn't corrupt the env of the caller
958 insinto /usr/share/applications 911 insinto /usr/share/applications
959 doins "${desktop}" 912 doins "${desktop}"
960 913 )
961 return 0
962} 914}
963 915
964# Make a GDM/KDM Session file 916# Make a GDM/KDM Session file
965# 917#
966# make_desktop_entry(<title>, <command>) 918# make_desktop_entry(<title>, <command>)
995 doins "${i}" 947 doins "${i}"
996 elif [[ -d ${i} ]] ; then 948 elif [[ -d ${i} ]] ; then
997 for j in "${i}"/*.desktop ; do 949 for j in "${i}"/*.desktop ; do
998 doins "${j}" 950 doins "${j}"
999 done 951 done
1000 fi 952 fi
1001 done 953 done
1002} 954}
1003newmenu() { 955newmenu() {
1004 insinto /usr/share/applications 956 insinto /usr/share/applications
1005 newins "$1" "$2" 957 newins "$1" "$2"
1013 doins "${i}" 965 doins "${i}"
1014 elif [[ -d ${i} ]] ; then 966 elif [[ -d ${i} ]] ; then
1015 for j in "${i}"/*.png ; do 967 for j in "${i}"/*.png ; do
1016 doins "${j}" 968 doins "${j}"
1017 done 969 done
1018 fi 970 fi
1019 done 971 done
1020} 972}
1021newicon() { 973newicon() {
1022 insinto /usr/share/pixmaps 974 insinto /usr/share/pixmaps
1023 newins "$1" "$2" 975 newins "$1" "$2"
1028############################################################## 980##############################################################
1029 981
1030 982
1031# for internal use only (unpack_pdv and unpack_makeself) 983# for internal use only (unpack_pdv and unpack_makeself)
1032find_unpackable_file() { 984find_unpackable_file() {
1033 local src="$1" 985 local src=$1
1034 if [ -z "${src}" ] 986 if [[ -z ${src} ]] ; then
1035 then
1036 src="${DISTDIR}/${A}" 987 src=${DISTDIR}/${A}
1037 else 988 else
1038 if [ -e "${DISTDIR}/${src}" ] 989 if [[ -e ${DISTDIR}/${src} ]] ; then
1039 then
1040 src="${DISTDIR}/${src}" 990 src=${DISTDIR}/${src}
1041 elif [ -e "${PWD}/${src}" ] 991 elif [[ -e ${PWD}/${src} ]] ; then
1042 then
1043 src="${PWD}/${src}" 992 src=${PWD}/${src}
1044 elif [ -e "${src}" ] 993 elif [[ -e ${src} ]] ; then
1045 then
1046 src="${src}" 994 src=${src}
1047 fi
1048 fi 995 fi
1049 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 996 fi
997 [[ ! -e ${src} ]] && return 1
1050 echo "${src}" 998 echo "${src}"
1051} 999}
1052 1000
1053# Unpack those pesky pdv generated files ... 1001# Unpack those pesky pdv generated files ...
1054# They're self-unpacking programs with the binary package stuffed in 1002# They're self-unpacking programs with the binary package stuffed in
1069# lseek 1017# lseek
1070# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1018# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1071# lseek(3, -4, SEEK_END) = 2981250 1019# lseek(3, -4, SEEK_END) = 2981250
1072# thus we would pass in the value of '4' as the second parameter. 1020# thus we would pass in the value of '4' as the second parameter.
1073unpack_pdv() { 1021unpack_pdv() {
1074 local src="`find_unpackable_file $1`" 1022 local src=$(find_unpackable_file $1)
1075 local sizeoff_t="$2" 1023 local sizeoff_t=$2
1076 1024
1025 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1077 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1026 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1078 1027
1079 local shrtsrc="`basename ${src}`" 1028 local shrtsrc=$(basename "${src}")
1080 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1029 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1081 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1030 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1082 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1031 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1083 1032
1084 # grab metadata for debug reasons 1033 # grab metadata for debug reasons
1148# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1097# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1149# - If the file is not specified then unpack will utilize ${A}. 1098# - If the file is not specified then unpack will utilize ${A}.
1150# - If the offset is not specified then we will attempt to extract 1099# - If the offset is not specified then we will attempt to extract
1151# the proper offset from the script itself. 1100# the proper offset from the script itself.
1152unpack_makeself() { 1101unpack_makeself() {
1102 local src_input=${1:-${A}}
1153 local src="$(find_unpackable_file "$1")" 1103 local src=$(find_unpackable_file "${src_input}")
1154 local skip="$2" 1104 local skip=$2
1155 local exe="$3" 1105 local exe=$3
1156 1106
1107 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1108
1157 local shrtsrc="$(basename "${src}")" 1109 local shrtsrc=$(basename "${src}")
1158 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1110 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1159 if [ -z "${skip}" ] 1111 if [[ -z ${skip} ]] ; then
1160 then
1161 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1112 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1162 local skip=0 1113 local skip=0
1163 exe=tail 1114 exe=tail
1164 case ${ver} in 1115 case ${ver} in
1165 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1116 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1166 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1117 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1178 ;; 1129 ;;
1179 2.1.3) 1130 2.1.3)
1180 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1131 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1181 let skip="skip + 1" 1132 let skip="skip + 1"
1182 ;; 1133 ;;
1183 2.1.4) 1134 2.1.4|2.1.5)
1184 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1135 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1185 skip=$(head -n ${skip} "${src}" | wc -c) 1136 skip=$(head -n ${skip} "${src}" | wc -c)
1186 exe="dd" 1137 exe="dd"
1187 ;; 1138 ;;
1188 *) 1139 *)
1233check_license() { 1184check_license() {
1234 local lic=$1 1185 local lic=$1
1235 if [ -z "${lic}" ] ; then 1186 if [ -z "${lic}" ] ; then
1236 lic="${PORTDIR}/licenses/${LICENSE}" 1187 lic="${PORTDIR}/licenses/${LICENSE}"
1237 else 1188 else
1238 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1189 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1239 lic="${PORTDIR}/licenses/${src}" 1190 lic="${PORTDIR}/licenses/${lic}"
1240 elif [ -e "${PWD}/${src}" ] ; then 1191 elif [ -e "${PWD}/${lic}" ] ; then
1241 lic="${PWD}/${src}" 1192 lic="${PWD}/${lic}"
1242 elif [ -e "${src}" ] ; then 1193 elif [ -e "${lic}" ] ; then
1243 lic="${src}" 1194 lic="${lic}"
1244 fi
1245 fi 1195 fi
1196 fi
1246 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1197 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1247 local l="`basename ${lic}`" 1198 local l="`basename ${lic}`"
1248 1199
1249 # here is where we check for the licenses the user already 1200 # here is where we check for the licenses the user already
1250 # accepted ... if we don't find a match, we make the user accept 1201 # accepted ... if we don't find a match, we make the user accept
1251 local shopts=$- 1202 local shopts=$-
1307 # 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
1308 # the # of files they gave us 1259 # the # of files they gave us
1309 local cdcnt=0 1260 local cdcnt=0
1310 local f= 1261 local f=
1311 for f in "$@" ; do 1262 for f in "$@" ; do
1312 cdcnt=$((cdcnt + 1)) 1263 ((++cdcnt))
1313 export CDROM_CHECK_${cdcnt}="$f" 1264 export CDROM_CHECK_${cdcnt}="$f"
1314 done 1265 done
1315 export CDROM_TOTAL_CDS=${cdcnt} 1266 export CDROM_TOTAL_CDS=${cdcnt}
1316 export CDROM_CURRENT_CD=1 1267 export CDROM_CURRENT_CD=1
1317 1268
1318 # now we see if the user gave use CD_ROOT ... 1269 # now we see if the user gave use CD_ROOT ...
1319 # 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
1320 if [[ ! -z ${CD_ROOT} ]] ; then
1321 export CDROM_ROOT=${CD_ROOT}
1322 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1323 return
1324 fi
1325 # do the same for CD_ROOT_X
1326 if [[ ! -z ${CD_ROOT_1} ]] ; then 1271 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1327 local var= 1272 local var=
1328 cdcnt=0 1273 cdcnt=0
1329 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1274 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1330 cdcnt=$((cdcnt + 1)) 1275 ((++cdcnt))
1331 var="CD_ROOT_${cdcnt}" 1276 var="CD_ROOT_${cdcnt}"
1277 [[ -z ${!var} ]] && var="CD_ROOT"
1332 if [[ -z ${!var} ]] ; then 1278 if [[ -z ${!var} ]] ; then
1333 eerror "You must either use just the CD_ROOT" 1279 eerror "You must either use just the CD_ROOT"
1334 eerror "or specify ALL the CD_ROOT_X variables." 1280 eerror "or specify ALL the CD_ROOT_X variables."
1335 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."
1336 die "could not locate CD_ROOT_${cdcnt}" 1282 die "could not locate CD_ROOT_${cdcnt}"
1337 fi 1283 fi
1338 export CDROM_ROOTS_${cdcnt}="${!var}"
1339 done 1284 done
1340 export CDROM_ROOT=${CDROM_ROOTS_1} 1285 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1341 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}
1342 return 1293 return
1343 fi 1294 fi
1344 1295
1296 # User didn't help us out so lets make sure they know they can
1297 # simplify the whole process ...
1345 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1298 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1346 einfon "This ebuild will need the " 1299 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1347 if [[ -z ${CDROM_NAME} ]] ; then
1348 echo "cdrom for ${PN}."
1349 else
1350 echo "${CDROM_NAME}."
1351 fi
1352 echo 1300 echo
1353 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"
1354 einfo "mounted somewhere on your filesystem, just export" 1302 einfo "mounted somewhere on your filesystem, just export"
1355 einfo "the variable CD_ROOT so that it points to the" 1303 einfo "the variable CD_ROOT so that it points to the"
1356 einfo "directory containing the files." 1304 einfo "directory containing the files."
1360 echo 1308 echo
1361 else 1309 else
1362 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1310 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1363 cdcnt=0 1311 cdcnt=0
1364 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1312 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1365 cdcnt=$((cdcnt + 1)) 1313 ((++cdcnt))
1366 var="CDROM_NAME_${cdcnt}" 1314 var="CDROM_NAME_${cdcnt}"
1367 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1315 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1368 done 1316 done
1369 echo 1317 echo
1370 einfo "If you do not have the CDs, but have the data files" 1318 einfo "If you do not have the CDs, but have the data files"
1371 einfo "mounted somewhere on your filesystem, just export" 1319 einfo "mounted somewhere on your filesystem, just export"
1372 einfo "the following variables so they point to the right place:" 1320 einfo "the following variables so they point to the right place:"
1373 einfon "" 1321 einfon ""
1374 cdcnt=0 1322 cdcnt=0
1375 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1323 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1376 cdcnt=$((cdcnt + 1)) 1324 ((++cdcnt))
1377 echo -n " CD_ROOT_${cdcnt}" 1325 echo -n " CD_ROOT_${cdcnt}"
1378 done 1326 done
1379 echo 1327 echo
1380 einfo "Or, if you have all the files in the same place, or" 1328 einfo "Or, if you have all the files in the same place, or"
1381 einfo "you only have one cdrom, you can export CD_ROOT" 1329 einfo "you only have one cdrom, you can export CD_ROOT"
1384 echo 1332 echo
1385 einfo "For example:" 1333 einfo "For example:"
1386 einfo "export CD_ROOT_1=/mnt/cdrom" 1334 einfo "export CD_ROOT_1=/mnt/cdrom"
1387 echo 1335 echo
1388 fi 1336 fi
1337
1338 export CDROM_SET=""
1389 export CDROM_CURRENT_CD=0 1339 export CDROM_CURRENT_CD=0
1390 cdrom_load_next_cd 1340 cdrom_load_next_cd
1391} 1341}
1392 1342
1393# this is only used when you need access to more than one cd. 1343# this is only used when you need access to more than one cd.
1394# when you have finished using the first cd, just call this function. 1344# when you have finished using the first cd, just call this function.
1395# when it returns, CDROM_ROOT will be pointing to the second cd. 1345# when it returns, CDROM_ROOT will be pointing to the second cd.
1396# remember, you can only go forward in the cd chain, you can't go back. 1346# remember, you can only go forward in the cd chain, you can't go back.
1397cdrom_load_next_cd() { 1347cdrom_load_next_cd() {
1398 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1399 local var= 1348 local var
1400 1349 ((++CDROM_CURRENT_CD))
1401 if [[ ! -z ${CD_ROOT} ]] ; then
1402 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1403 return
1404 fi
1405 1350
1406 unset CDROM_ROOT 1351 unset CDROM_ROOT
1407 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1352 var=CD_ROOT_${CDROM_CURRENT_CD}
1353 [[ -z ${!var} ]] && var="CD_ROOT"
1408 if [[ -z ${!var} ]] ; then 1354 if [[ -z ${!var} ]] ; then
1409 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1355 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1410 cdrom_locate_file_on_cd ${!var} 1356 _cdrom_locate_file_on_cd ${!var}
1411 else 1357 else
1412 export CDROM_ROOT=${!var} 1358 export CDROM_ROOT=${!var}
1413 fi 1359 fi
1414 1360
1415 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1361 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1420# all it does is try to locate a give file on a cd ... if the cd isn't 1366# all it does is try to locate a give file on a cd ... if the cd isn't
1421# found, then a message asking for the user to insert the cdrom will be 1367# found, then a message asking for the user to insert the cdrom will be
1422# displayed and we'll hang out here until: 1368# displayed and we'll hang out here until:
1423# (1) the file is found on a mounted cdrom 1369# (1) the file is found on a mounted cdrom
1424# (2) the user hits CTRL+C 1370# (2) the user hits CTRL+C
1425cdrom_locate_file_on_cd() { 1371_cdrom_locate_file_on_cd() {
1372 local mline=""
1373 local showedmsg=0
1374
1426 while [[ -z ${CDROM_ROOT} ]] ; do 1375 while [[ -z ${CDROM_ROOT} ]] ; do
1376 local i=0
1377 local -a cdset=(${*//:/ })
1378 if [[ -n ${CDROM_SET} ]] ; then
1379 cdset=(${cdset[${CDROM_SET}]})
1380 fi
1381
1382 while [[ -n ${cdset[${i}]} ]] ; do
1427 local dir="$(dirname ${@})" 1383 local dir=$(dirname ${cdset[${i}]})
1428 local file="$(basename ${@})" 1384 local file=$(basename ${cdset[${i}]})
1429 local mline=""
1430 local showedmsg=0
1431 1385
1432 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1386 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1433 [[ -d ${mline}/${dir} ]] || continue 1387 [[ -d ${mline}/${dir} ]] || continue
1434 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1388 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1435 && export CDROM_ROOT=${mline} 1389 export CDROM_ROOT=${mline}
1390 export CDROM_SET=${i}
1391 export CDROM_MATCH=${cdset[${i}]}
1392 return
1393 fi
1394 done
1395
1396 ((++i))
1436 done 1397 done
1437 1398
1438 if [[ -z ${CDROM_ROOT} ]] ; then
1439 echo 1399 echo
1440 if [[ ${showedmsg} -eq 0 ]] ; then 1400 if [[ ${showedmsg} -eq 0 ]] ; then
1441 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1401 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1442 if [[ -z ${CDROM_NAME} ]] ; then 1402 if [[ -z ${CDROM_NAME} ]] ; then
1443 einfo "Please insert the cdrom for ${PN} now !" 1403 einfo "Please insert+mount the cdrom for ${PN} now !"
1444 else
1445 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1446 fi
1447 else 1404 else
1448 if [[ -z ${CDROM_NAME_1} ]] ; then
1449 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1450 else
1451 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1452 einfo "Please insert+mount the ${!var} cdrom now !" 1405 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1453 fi
1454 fi 1406 fi
1455 showedmsg=1 1407 else
1408 if [[ -z ${CDROM_NAME_1} ]] ; then
1409 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1410 else
1411 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1412 einfo "Please insert+mount the ${!var} cdrom now !"
1413 fi
1456 fi 1414 fi
1415 showedmsg=1
1416 fi
1457 einfo "Press return to scan for the cd again" 1417 einfo "Press return to scan for the cd again"
1458 einfo "or hit CTRL+C to abort the emerge." 1418 einfo "or hit CTRL+C to abort the emerge."
1459 read 1419 echo
1460 fi 1420 einfo "If you are having trouble with the detection"
1421 einfo "of your CD, it is possible that you do not have"
1422 einfo "Joliet support enabled in your kernel. Please"
1423 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1424 read || die "something is screwed with your system"
1461 done 1425 done
1462} 1426}
1463 1427
1464# Make sure that LINGUAS only contains languages that 1428# Make sure that LINGUAS only contains languages that
1465# a package can support 1429# a package can support
1475# directories and uses the union of the lists. 1439# directories and uses the union of the lists.
1476strip-linguas() { 1440strip-linguas() {
1477 local ls newls 1441 local ls newls
1478 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1442 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1479 local op=$1; shift 1443 local op=$1; shift
1480 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1444 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1481 local d f 1445 local d f
1482 for d in "$@" ; do 1446 for d in "$@" ; do
1483 if [[ ${op} == "-u" ]] ; then 1447 if [[ ${op} == "-u" ]] ; then
1484 newls=${ls} 1448 newls=${ls}
1485 else 1449 else
1486 newls="" 1450 newls=""
1487 fi 1451 fi
1488 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1452 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1489 if [[ ${op} == "-i" ]] ; then 1453 if [[ ${op} == "-i" ]] ; then
1490 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1454 hasq ${f} ${ls} && newls="${newls} ${f}"
1491 else 1455 else
1492 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1456 hasq ${f} ${ls} || newls="${newls} ${f}"
1493 fi 1457 fi
1494 done 1458 done
1495 ls=${newls} 1459 ls=${newls}
1496 done 1460 done
1497 ls=${ls//.po}
1498 else 1461 else
1499 ls=$@ 1462 ls="$@"
1500 fi 1463 fi
1501 1464
1502 ls=" ${ls} "
1503 newls="" 1465 newls=""
1504 for f in ${LINGUAS} ; do 1466 for f in ${LINGUAS} ; do
1505 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1467 if hasq ${f} ${ls} ; then
1506 newls="${newls} ${f}" 1468 newls="${newls} ${f}"
1507 else 1469 else
1508 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1470 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1509 fi 1471 fi
1510 done 1472 done
1511 if [[ -z ${newls} ]] ; then
1512 export LINGUAS=""
1513 else
1514 export LINGUAS=${newls:1} 1473 export LINGUAS=${newls:1}
1515 fi
1516} 1474}
1517 1475
1518# moved from kernel.eclass since they are generally useful outside of 1476# moved from kernel.eclass since they are generally useful outside of
1519# kernel.eclass -iggy (20041002) 1477# kernel.eclass -iggy (20041002)
1520 1478
1527 while ((i--)) ; do 1485 while ((i--)) ; do
1528 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1486 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1529 done 1487 done
1530 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1488 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1531 case ${ARCH} in 1489 case ${ARCH} in
1532 x86) export ARCH="i386";; 1490 x86) export ARCH="i386";;
1533 amd64) export ARCH="x86_64";; 1491 amd64) export ARCH="x86_64";;
1534 hppa) export ARCH="parisc";; 1492 hppa) export ARCH="parisc";;
1535 mips) export ARCH="mips";; 1493 mips) export ARCH="mips";;
1536 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! 1494 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!
1537 *) export ARCH="${ARCH}";; 1495 *) export ARCH="${ARCH}";;
1538 esac 1496 esac
1539} 1497}
1540 1498
1541# set's ARCH back to what portage expects 1499# set's ARCH back to what portage expects
1542set_arch_to_portage() { 1500set_arch_to_portage() {
1549 1507
1550# Jeremy Huddleston <eradicator@gentoo.org>: 1508# Jeremy Huddleston <eradicator@gentoo.org>:
1551# preserve_old_lib /path/to/libblah.so.0 1509# preserve_old_lib /path/to/libblah.so.0
1552# preserve_old_lib_notify /path/to/libblah.so.0 1510# preserve_old_lib_notify /path/to/libblah.so.0
1553# 1511#
1554# These functions are useful when a lib in your package changes --soname. Such 1512# These functions are useful when a lib in your package changes --library. Such
1555# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1513# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1556# would break packages that link against it. Most people get around this 1514# would break packages that link against it. Most people get around this
1557# by using the portage SLOT mechanism, but that is not always a relevant 1515# by using the portage SLOT mechanism, but that is not always a relevant
1558# solution, so instead you can add the following to your ebuilds: 1516# solution, so instead you can add the following to your ebuilds:
1559# 1517#
1586 LIB=$1 1544 LIB=$1
1587 1545
1588 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1546 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1589 SONAME=`basename ${LIB}` 1547 SONAME=`basename ${LIB}`
1590 1548
1591 einfo "An old version of an installed library was detected on your system." 1549 ewarn "An old version of an installed library was detected on your system."
1592 einfo "In order to avoid breaking packages that link against is, this older version" 1550 ewarn "In order to avoid breaking packages that link against it, this older version"
1593 einfo "is not being removed. In order to make full use of this newer version," 1551 ewarn "is not being removed. In order to make full use of this newer version,"
1594 einfo "you will need to execute the following command:" 1552 ewarn "you will need to execute the following command:"
1595 einfo " revdep-rebuild --soname ${SONAME}" 1553 ewarn " revdep-rebuild --library ${SONAME}"
1596 einfo 1554 ewarn
1597 einfo "After doing that, you can safely remove ${LIB}" 1555 ewarn "After doing that, you can safely remove ${LIB}"
1598 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1556 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1599 fi 1557 fi
1600} 1558}
1601 1559
1602# Hack for people to figure out if a package was built with 1560# Hack for people to figure out if a package was built with
1603# certain USE flags 1561# certain USE flags
1613 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1571 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1614 1572
1615 local PKG=$(best_version $1) 1573 local PKG=$(best_version $1)
1616 shift 1574 shift
1617 1575
1618 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1576 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1577
1578 # if the USE file doesnt exist, assume the $PKG is either
1579 # injected or package.provided
1619 [[ ! -e ${USEFILE} ]] && return 1 1580 [[ ! -e ${USEFILE} ]] && return 0
1620 1581
1621 local USE_BUILT=$(<${USEFILE}) 1582 local USE_BUILT=$(<${USEFILE})
1622 while [[ $# -gt 0 ]] ; do 1583 while [[ $# -gt 0 ]] ; do
1623 if [[ ${opt} = "-o" ]] ; then 1584 if [[ ${opt} = "-o" ]] ; then
1624 has $1 ${USE_BUILT} && return 0 1585 has $1 ${USE_BUILT} && return 0
1676# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1637# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1677# $5 == path for wrapper 1638# $5 == path for wrapper
1678make_wrapper() { 1639make_wrapper() {
1679 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1640 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1680 local tmpwrapper=$(emktemp) 1641 local tmpwrapper=$(emktemp)
1642 # We don't want to quote ${bin} so that people can pass complex
1643 # things as $bin ... "./someprog --args"
1681 cat << EOF > "${tmpwrapper}" 1644 cat << EOF > "${tmpwrapper}"
1682#!/bin/sh 1645#!/bin/sh
1683cd "${chdir}" 1646cd "${chdir:-.}"
1647if [ -n "${libdir}" ] ; then
1648 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1684export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1649 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1650 else
1651 export LD_LIBRARY_PATH="${libdir}"
1652 fi
1653fi
1685exec ${bin} "\$@" 1654exec ${bin} "\$@"
1686EOF 1655EOF
1687 chmod go+rx "${tmpwrapper}" 1656 chmod go+rx "${tmpwrapper}"
1688 if [ -n "${5}" ] 1657 if [[ -n ${path} ]] ; then
1689 then
1690 exeinto ${5} 1658 exeinto "${path}"
1691 newexe "${tmpwrapper}" "${wrapper}" 1659 newexe "${tmpwrapper}" "${wrapper}"
1692 else 1660 else
1693 newbin "${tmpwrapper}" "${wrapper}" 1661 newbin "${tmpwrapper}" "${wrapper}"
1694 fi 1662 fi
1695} 1663}

Legend:
Removed from v.1.173  
changed lines
  Added in v.1.237

  ViewVC Help
Powered by ViewVC 1.1.20