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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20