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

Diff of /eclass/eutils.eclass

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

Revision 1.244 Revision 1.284
1# Copyright 1999-2006 Gentoo Foundation 1# Copyright 1999-2007 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.244 2006/07/06 23:53:57 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.284 2007/06/21 04:44:45 vapier Exp $
4# 4
5# This eclass is for general purpose functions that most ebuilds 5# @ECLASS: eutils.eclass
6# have to implement themselves. 6# @MAINTAINER:
7# 7# base-system@gentoo.org
8# NB: If you add anything, please comment it! 8# @BLURB: many extra (but common) functions that are used in ebuilds
9# 9# @DESCRIPTION:
10# Maintainer: see each individual function, base-system@gentoo.org as default 10# The eutils eclass contains a suite of functions that complement
11# the ones that ebuild.sh already contain. The idea is that the functions
12# are not required in all ebuilds but enough utilize them to have a common
13# home rather than having multiple ebuilds implementing the same thing.
14#
15# Due to the nature of this eclass, some functions may have maintainers
16# different from the overall eclass!
11 17
12inherit multilib portability 18inherit multilib portability
13 19
14DESCRIPTION="Based on the ${ECLASS} eclass" 20DESCRIPTION="Based on the ${ECLASS} eclass"
15 21
16# Wait for the supplied number of seconds. If no argument is supplied, defaults 22# @FUNCTION: epause
17# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 23# @USAGE: [seconds]
18# outputting to a terminal, don't wait. For compatability purposes, the argument 24# @DESCRIPTION:
19# must be an integer greater than zero. 25# Sleep for the specified number of seconds (default of 5 seconds). Useful when
20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 26# printing a message the user should probably be reading and often used in
27# conjunction with the ebeep function. If the EPAUSE_IGNORE env var is set,
28# don't wait at all.
21epause() { 29epause() {
22 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then 30 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
23 sleep ${1:-5}
24 fi
25} 31}
26 32
27# Beep the specified number of times (defaults to five). If our output 33# @FUNCTION: ebeep
28# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set, 34# @USAGE: [number of beeps]
35# @DESCRIPTION:
36# Issue the specified number of beeps (default of 5 beeps). Useful when
37# printing a message the user should probably be reading and often used in
38# conjunction with the epause function. If the EBEEP_IGNORE env var is set,
29# don't beep. 39# don't beep at all.
30# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
31ebeep() { 40ebeep() {
32 local n 41 local n
33 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then 42 if [[ -z ${EBEEP_IGNORE} ]] ; then
34 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 43 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
35 echo -ne "\a" 44 echo -ne "\a"
36 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null 45 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
37 echo -ne "\a" 46 echo -ne "\a"
38 sleep 1 47 sleep 1
39 done 48 done
40 fi 49 fi
41} 50}
42
43# This function generate linker scripts in /usr/lib for dynamic
44# libs in /lib. This is to fix linking problems when you have
45# the .so in /lib, and the .a in /usr/lib. What happens is that
46# in some cases when linking dynamic, the .a in /usr/lib is used
47# instead of the .so in /lib due to gcc/libtool tweaking ld's
48# library search path. This cause many builds to fail.
49# See bug #4411 for more info.
50#
51# To use, simply call:
52#
53# gen_usr_ldscript libfoo.so
54#
55# Note that you should in general use the unversioned name of
56# the library, as ldconfig should usually update it correctly
57# to point to the latest version of the library present.
58#
59# <azarah@gentoo.org> (26 Oct 2002)
60#
61gen_usr_ldscript() {
62 local lib libdir=$(get_libdir)
63 # Just make sure it exists
64 dodir /usr/${libdir}
65
66 for lib in "${@}" ; do
67 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
68 /* GNU ld script
69 Since Gentoo has critical dynamic libraries
70 in /lib, and the static versions in /usr/lib,
71 we need to have a "fake" dynamic lib in /usr/lib,
72 otherwise we run into linking problems.
73
74 See bug http://bugs.gentoo.org/4411 for more info.
75 */
76 GROUP ( /${libdir}/${lib} )
77 END_LDSCRIPT
78 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
79 done
80}
81
82 51
83# Default directory where patches are located 52# Default directory where patches are located
84EPATCH_SOURCE="${WORKDIR}/patch" 53EPATCH_SOURCE="${WORKDIR}/patch"
85# Default extension for patches 54# Default extension for patches
86EPATCH_SUFFIX="patch.bz2" 55EPATCH_SUFFIX="patch.bz2"
87# Default options for patch 56# Default options for patch
88# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 57# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
89# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 58# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
90# Set -E to automatically remove empty files. 59# Set -E to automatically remove empty files.
91EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 60EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
92# List of patches not to apply. Not this is only file names, 61# List of patches not to apply. Not this is only file names,
93# and not the full path .. 62# and not the full path ..
94EPATCH_EXCLUDE="" 63EPATCH_EXCLUDE=""
95# Change the printed message for a single patch. 64# Change the printed message for a single patch.
96EPATCH_SINGLE_MSG="" 65EPATCH_SINGLE_MSG=""
97# Change the printed message for multiple patches. 66# Change the printed message for multiple patches.
98EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 67EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
99# Force applying bulk patches even if not following the style: 68# Force applying bulk patches even if not following the style:
100# 69#
101# ??_${ARCH}_foo.${EPATCH_SUFFIX} 70# ??_${ARCH}_foo.${EPATCH_SUFFIX}
102# 71#
103EPATCH_FORCE="no" 72EPATCH_FORCE="no"
104 73
105# This function is for bulk patching, or in theory for just one 74# This function is for bulk patching, or in theory for just one
106# or two patches. 75# or two patches.
117# 86#
118# Patches are applied in current directory. 87# Patches are applied in current directory.
119# 88#
120# Bulk Patches should preferibly have the form of: 89# Bulk Patches should preferibly have the form of:
121# 90#
122# ??_${ARCH}_foo.${EPATCH_SUFFIX} 91# ??_${ARCH}_foo.${EPATCH_SUFFIX}
123# 92#
124# For example: 93# For example:
125# 94#
126# 01_all_misc-fix.patch.bz2 95# 01_all_misc-fix.patch.bz2
127# 02_sparc_another-fix.patch.bz2 96# 02_sparc_another-fix.patch.bz2
128# 97#
129# This ensures that there are a set order, and you can have ARCH 98# This ensures that there are a set order, and you can have ARCH
130# specific patches. 99# specific patches.
131# 100#
132# If you however give an argument to epatch(), it will treat it as a 101# If you however give an argument to epatch(), it will treat it as a
220 fi 189 fi
221 for x in ${EPATCH_SOURCE} 190 for x in ${EPATCH_SOURCE}
222 do 191 do
223 # New ARCH dependant patch naming scheme ... 192 # New ARCH dependant patch naming scheme ...
224 # 193 #
225 # ???_arch_foo.patch 194 # ???_arch_foo.patch
226 # 195 #
227 if [ -f ${x} ] && \ 196 if [ -f ${x} ] && \
228 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \ 197 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
229 [ "${EPATCH_FORCE}" = "yes" ]) 198 [ "${EPATCH_FORCE}" = "yes" ])
230 then 199 then
231 local count=0 200 local count=0
232 local popts="${EPATCH_OPTS}" 201 local popts="${EPATCH_OPTS}"
233 local patchname=${x##*/} 202 local patchname=${x##*/}
234 203
262 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 231 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
263 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 232 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
264 233
265 if [ "${PATCH_SUFFIX}" != "patch" ] 234 if [ "${PATCH_SUFFIX}" != "patch" ]
266 then 235 then
267 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 236 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
268 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 237 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
269 else 238 else
270 PATCH_TARGET="${x}" 239 PATCH_TARGET="${x}"
271 fi 240 fi
272 241
273 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 242 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
274 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 243 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
275 244
276 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 245 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
277 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 246 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
278 247
344 then 313 then
345 einfo "Done with patching" 314 einfo "Done with patching"
346 fi 315 fi
347} 316}
348 317
318# @FUNCTION: emktemp
319# @USAGE: [temp dir]
320# @DESCRIPTION:
349# Cheap replacement for when debianutils (and thus mktemp) 321# Cheap replacement for when debianutils (and thus mktemp)
350# does not exist on the users system 322# does not exist on the users system.
351# vapier@gentoo.org
352#
353# Takes just 1 optional parameter (the directory to create tmpfile in)
354emktemp() { 323emktemp() {
355 local exe="touch" 324 local exe="touch"
356 [[ $1 == -d ]] && exe="mkdir" && shift 325 [[ $1 == -d ]] && exe="mkdir" && shift
357 local topdir=$1 326 local topdir=$1
358 327
360 [[ -z ${T} ]] \ 329 [[ -z ${T} ]] \
361 && topdir="/tmp" \ 330 && topdir="/tmp" \
362 || topdir=${T} 331 || topdir=${T}
363 fi 332 fi
364 333
365 if [[ -z $(type -p mktemp) ]] ; then 334 if ! type -P mktemp > /dev/null ; then
335 # system lacks `mktemp` so we have to fake it
366 local tmp=/ 336 local tmp=/
367 while [[ -e ${tmp} ]] ; do 337 while [[ -e ${tmp} ]] ; do
368 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 338 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
369 done 339 done
370 ${exe} "${tmp}" || ${exe} -p "${tmp}" 340 ${exe} "${tmp}" || ${exe} -p "${tmp}"
371 echo "${tmp}" 341 echo "${tmp}"
372 else 342 else
343 # the args here will give slightly wierd names on BSD,
344 # but should produce a usable file on all userlands
373 if [[ ${exe} == "touch" ]] ; then 345 if [[ ${exe} == "touch" ]] ; then
374 [[ ${USERLAND} == "GNU" ]] \
375 && mktemp -p "${topdir}" \
376 || TMPDIR="${topdir}" mktemp -t tmp 346 TMPDIR="${topdir}" mktemp -t tmp.XXXXXXXXXX
377 else 347 else
378 [[ ${USERLAND} == "GNU" ]] \
379 && mktemp -d "${topdir}" \
380 || TMPDIR="${topdir}" mktemp -dt tmp 348 TMPDIR="${topdir}" mktemp -dt tmp.XXXXXXXXXX
381 fi
382 fi 349 fi
350 fi
383} 351}
384 352
353# @FUNCTION: egetent
354# @USAGE: <database> <key>
355# @MAINTAINER:
356# base-system@gentoo.org (Linux)
357# Joe Jezak <josejx@gmail.com> (OS X)
358# usata@gentoo.org (OS X)
359# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
360# @DESCRIPTION:
385# Small wrapper for getent (Linux), nidump (Mac OS X), 361# Small wrapper for getent (Linux), nidump (Mac OS X),
386# and pw (FreeBSD) used in enewuser()/enewgroup() 362# and pw (FreeBSD) used in enewuser()/enewgroup()
387# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
388# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
389#
390# egetent(database, key)
391egetent() { 363egetent() {
392 case ${CHOST} in 364 case ${CHOST} in
393 *-darwin*) 365 *-darwin*)
394 case "$2" in 366 case "$2" in
395 *[!0-9]*) # Non numeric 367 *[!0-9]*) # Non numeric
419 getent "$1" "$2" 391 getent "$1" "$2"
420 ;; 392 ;;
421 esac 393 esac
422} 394}
423 395
424# Simplify/standardize adding users to the system 396# @FUNCTION: enewuser
425# vapier@gentoo.org 397# @USAGE: <user> [uid] [shell] [homedir] [groups] [params]
426# 398# @DESCRIPTION:
427# enewuser(username, uid, shell, homedir, groups, extra options) 399# Same as enewgroup, you are not required to understand how to properly add
428# 400# a user to the system. The only required parameter is the username.
429# Default values if you do not specify any: 401# Default uid is (pass -1 for this) next available, default shell is
430# username: REQUIRED ! 402# /bin/false, default homedir is /dev/null, there are no default groups,
431# uid: next available (see useradd(8)) 403# and default params sets the comment as 'added by portage for ${PN}'.
432# note: pass -1 to get default behavior
433# shell: /bin/false
434# homedir: /dev/null
435# groups: none
436# extra: comment of 'added by portage for ${PN}'
437enewuser() { 404enewuser() {
438 case ${EBUILD_PHASE} in 405 case ${EBUILD_PHASE} in
439 unpack|compile|test|install) 406 unpack|compile|test|install)
440 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function." 407 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
441 eerror "Package fails at QA and at life. Please file a bug." 408 eerror "Package fails at QA and at life. Please file a bug."
448 eerror "No username specified !" 415 eerror "No username specified !"
449 die "Cannot call enewuser without a username" 416 die "Cannot call enewuser without a username"
450 fi 417 fi
451 418
452 # lets see if the username already exists 419 # lets see if the username already exists
453 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then 420 if [[ -n $(egetent passwd "${euser}") ]] ; then
454 return 0 421 return 0
455 fi 422 fi
456 einfo "Adding user '${euser}' to your system ..." 423 einfo "Adding user '${euser}' to your system ..."
457 424
458 # options to pass to useradd 425 # options to pass to useradd
459 local opts= 426 local opts=
460 427
461 # handle uid 428 # handle uid
462 local euid=$1; shift 429 local euid=$1; shift
463 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then 430 if [[ -n ${euid} && ${euid} != -1 ]] ; then
464 if [[ ${euid} -gt 0 ]] ; then 431 if [[ ${euid} -gt 0 ]] ; then
465 if [[ ! -z $(egetent passwd ${euid}) ]] ; then 432 if [[ -n $(egetent passwd ${euid}) ]] ; then
466 euid="next" 433 euid="next"
467 fi 434 fi
468 else 435 else
469 eerror "Userid given but is not greater than 0 !" 436 eerror "Userid given but is not greater than 0 !"
470 die "${euid} is not a valid UID" 437 die "${euid} is not a valid UID"
471 fi 438 fi
472 else 439 else
473 euid="next" 440 euid="next"
474 fi 441 fi
475 if [[ ${euid} == "next" ]] ; then 442 if [[ ${euid} == "next" ]] ; then
476 for euid in $(seq 101 999) ; do 443 for ((euid = 101; euid <= 999; euid++)); do
477 [[ -z $(egetent passwd ${euid}) ]] && break 444 [[ -z $(egetent passwd ${euid}) ]] && break
478 done 445 done
479 fi 446 fi
480 opts="${opts} -u ${euid}" 447 opts="${opts} -u ${euid}"
481 einfo " - Userid: ${euid}" 448 einfo " - Userid: ${euid}"
495 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do 462 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
496 [[ -x ${ROOT}${shell} ]] && break 463 [[ -x ${ROOT}${shell} ]] && break
497 done 464 done
498 465
499 if [[ ${shell} == "/dev/null" ]] ; then 466 if [[ ${shell} == "/dev/null" ]] ; then
500 eerror "Unable to identify the shell to use" 467 eerror "Unable to identify the shell to use, proceeding with userland default."
501 die "Unable to identify the shell to use" 468 case ${USERLAND} in
469 GNU) shell="/bin/false" ;;
470 BSD) shell="/sbin/nologin" ;;
471 Darwin) shell="/usr/sbin/nologin" ;;
472 *) die "Unable to identify the default shell for userland ${USERLAND}"
473 esac
502 fi 474 fi
503 475
504 eshell=${shell} 476 eshell=${shell}
505 fi 477 fi
506 einfo " - Shell: ${eshell}" 478 einfo " - Shell: ${eshell}"
625 fi 597 fi
626 598
627 export SANDBOX_ON=${oldsandbox} 599 export SANDBOX_ON=${oldsandbox}
628} 600}
629 601
630# Simplify/standardize adding groups to the system 602# @FUNCTION: enewgroup
631# vapier@gentoo.org 603# @USAGE: <group> [gid]
632# 604# @DESCRIPTION:
633# enewgroup(group, gid) 605# This function does not require you to understand how to properly add a
634# 606# group to the system. Just give it a group name to add and enewgroup will
635# Default values if you do not specify any: 607# do the rest. You may specify the gid for the group or allow the group to
636# groupname: REQUIRED ! 608# allocate the next available one.
637# gid: next available (see groupadd(8))
638# extra: none
639enewgroup() { 609enewgroup() {
640 case ${EBUILD_PHASE} in 610 case ${EBUILD_PHASE} in
641 unpack|compile|test|install) 611 unpack|compile|test|install)
642 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function." 612 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
643 eerror "Package fails at QA and at life. Please file a bug." 613 eerror "Package fails at QA and at life. Please file a bug."
651 eerror "No group specified !" 621 eerror "No group specified !"
652 die "Cannot call enewgroup without a group" 622 die "Cannot call enewgroup without a group"
653 fi 623 fi
654 624
655 # see if group already exists 625 # see if group already exists
656 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 626 if [[ -n $(egetent group "${egroup}") ]]; then
657 then
658 return 0 627 return 0
659 fi 628 fi
660 einfo "Adding group '${egroup}' to your system ..." 629 einfo "Adding group '${egroup}' to your system ..."
661 630
662 # options to pass to useradd 631 # options to pass to useradd
705 fi 674 fi
706 675
707 # If we need the next available 676 # If we need the next available
708 case ${egid} in 677 case ${egid} in
709 *[!0-9]*) # Non numeric 678 *[!0-9]*) # Non numeric
710 for egid in $(seq 101 999); do 679 for ((egid = 101; egid <= 999; egid++)); do
711 [ -z "`egetent group ${egid}`" ] && break 680 [[ -z $(egetent group ${egid}) ]] && break
712 done 681 done
713 esac 682 esac
714 dscl . create /groups/${egroup} gid ${egid} 683 dscl . create /groups/${egroup} gid ${egid}
715 dscl . create /groups/${egroup} passwd '*' 684 dscl . create /groups/${egroup} passwd '*'
716 ;; 685 ;;
717 686
718 *-freebsd*|*-dragonfly*) 687 *-freebsd*|*-dragonfly*)
719 case ${egid} in 688 case ${egid} in
720 *[!0-9]*) # Non numeric 689 *[!0-9]*) # Non numeric
721 for egid in $(seq 101 999); do 690 for ((egid = 101; egid <= 999; egid++)); do
722 [ -z "`egetent group ${egid}`" ] && break 691 [[ -z $(egetent group ${egid}) ]] && break
723 done 692 done
724 esac 693 esac
725 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 694 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
726 ;; 695 ;;
727 696
728 *-netbsd*) 697 *-netbsd*)
729 case ${egid} in 698 case ${egid} in
730 *[!0-9]*) # Non numeric 699 *[!0-9]*) # Non numeric
731 for egid in $(seq 101 999); do 700 for ((egid = 101; egid <= 999; egid++)); do
732 [ -z "`egetent group ${egid}`" ] && break 701 [[ -z $(egetent group ${egid}) ]] && break
733 done 702 done
734 esac 703 esac
735 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 704 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
736 ;; 705 ;;
737 706
740 ;; 709 ;;
741 esac 710 esac
742 export SANDBOX_ON="${oldsandbox}" 711 export SANDBOX_ON="${oldsandbox}"
743} 712}
744 713
745# Simple script to replace 'dos2unix' binaries 714# @FUNCTION: edos2unix
746# vapier@gentoo.org 715# @USAGE: <file> [more files ...]
747# 716# @DESCRIPTION:
748# edos2unix(file, <more files> ...) 717# A handy replacement for dos2unix, recode, fixdos, etc... This allows you
718# to remove all of these text utilities from DEPEND variables because this
719# is a script based solution. Just give it a list of files to convert and
720# they will all be changed from the DOS CRLF format to the UNIX LF format.
749edos2unix() { 721edos2unix() {
750 for f in "$@" 722 echo "$@" | xargs sed -i 's/\r$//'
751 do
752 cp "${f}" ${T}/edos2unix
753 sed 's/\r$//' ${T}/edos2unix > "${f}"
754 done
755} 723}
756
757
758##############################################################
759# START: Handle .desktop files and menu entries #
760# maybe this should be separated into a new eclass some time #
761# lanius@gentoo.org #
762##############################################################
763 724
764# Make a desktop file ! 725# Make a desktop file !
765# Great for making those icons in kde/gnome startmenu ! 726# Great for making those icons in kde/gnome startmenu !
766# Amaze your friends ! Get the women ! Join today ! 727# Amaze your friends ! Get the women ! Join today !
767# 728#
768# make_desktop_entry(<command>, [name], [icon], [type], [path]) 729# make_desktop_entry(<command>, [name], [icon], [type], [path])
769# 730#
770# binary: what command does the app run with ? 731# binary: what command does the app run with ?
771# name: the name that will show up in the menu 732# name: the name that will show up in the menu
772# icon: give your little like a pretty little icon ... 733# icon: give your little like a pretty little icon ...
773# this can be relative (to /usr/share/pixmaps) or 734# this can be relative (to /usr/share/pixmaps) or
774# a full path to an icon 735# a full path to an icon
775# type: what kind of application is this ? for categories: 736# type: what kind of application is this ? for categories:
776# http://www.freedesktop.org/Standards/desktop-entry-spec 737# http://standards.freedesktop.org/menu-spec/latest/apa.html
777# path: if your app needs to startup in a specific dir 738# path: if your app needs to startup in a specific dir
778make_desktop_entry() { 739make_desktop_entry() {
779 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 740 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
780 741
781 local exec=${1} 742 local exec=${1}
788 local catmaj=${CATEGORY%%-*} 749 local catmaj=${CATEGORY%%-*}
789 local catmin=${CATEGORY##*-} 750 local catmin=${CATEGORY##*-}
790 case ${catmaj} in 751 case ${catmaj} in
791 app) 752 app)
792 case ${catmin} in 753 case ${catmin} in
754 accessibility) type=Accessibility;;
793 admin) type=System;; 755 admin) type=System;;
756 antivirus) type=System;;
757 arch) type=Archiving;;
758 backup) type=Archiving;;
794 cdr) type=DiscBurning;; 759 cdr) type=DiscBurning;;
795 dicts) type=Dictionary;; 760 dicts) type=Dictionary;;
761 doc) type=Documentation;;
796 editors) type=TextEditor;; 762 editors) type=TextEditor;;
797 emacs) type=TextEditor;; 763 emacs) type=TextEditor;;
798 emulation) type=Emulator;; 764 emulation) type=Emulator;;
799 laptop) type=HardwareSettings;; 765 laptop) type=HardwareSettings;;
800 office) type=Office;; 766 office) type=Office;;
767 pda) type=PDA;;
801 vim) type=TextEditor;; 768 vim) type=TextEditor;;
802 xemacs) type=TextEditor;; 769 xemacs) type=TextEditor;;
803 *) type=;; 770 *) type=;;
804 esac 771 esac
805 ;; 772 ;;
806 773
807 dev) 774 dev)
808 type="Development" 775 type="Development"
809 ;; 776 ;;
810 777
811 games) 778 games)
812 case ${catmin} in 779 case ${catmin} in
813 action) type=ActionGame;; 780 action|fps) type=ActionGame;;
814 arcade) type=ArcadeGame;; 781 arcade) type=ArcadeGame;;
815 board) type=BoardGame;; 782 board) type=BoardGame;;
816 kid) type=KidsGame;;
817 emulation) type=Emulator;; 783 emulation) type=Emulator;;
784 kids) type=KidsGame;;
818 puzzle) type=LogicGame;; 785 puzzle) type=LogicGame;;
819 rpg) type=RolePlaying;;
820 roguelike) type=RolePlaying;; 786 roguelike) type=RolePlaying;;
787 rpg) type=RolePlaying;;
821 simulation) type=Simulation;; 788 simulation) type=Simulation;;
822 sports) type=SportsGame;; 789 sports) type=SportsGame;;
823 strategy) type=StrategyGame;; 790 strategy) type=StrategyGame;;
824 *) type=;; 791 *) type=;;
825 esac 792 esac
826 type="Game;${type}" 793 type="Game;${type}"
794 ;;
795
796 gnome)
797 type="Gnome;GTK"
798 ;;
799
800 kde)
801 type="KDE;Qt"
827 ;; 802 ;;
828 803
829 mail) 804 mail)
830 type="Network;Email" 805 type="Network;Email"
831 ;; 806 ;;
833 media) 808 media)
834 case ${catmin} in 809 case ${catmin} in
835 gfx) type=Graphics;; 810 gfx) type=Graphics;;
836 radio) type=Tuner;; 811 radio) type=Tuner;;
837 sound) type=Audio;; 812 sound) type=Audio;;
838 tv) type=TV;; 813 tv) type=TV;;
839 video) type=Video;; 814 video) type=Video;;
840 *) type=;; 815 *) type=;;
841 esac 816 esac
842 type="AudioVideo;${type}" 817 type="AudioVideo;${type}"
843 ;; 818 ;;
844 819
845 net) 820 net)
846 case ${catmin} in 821 case ${catmin} in
847 dialup) type=Dialup;; 822 dialup) type=Dialup;;
848 ftp) type=FileTransfer;; 823 ftp) type=FileTransfer;;
849 im) type=InstantMessaging;; 824 im) type=InstantMessaging;;
850 irc) type=IRCClient;; 825 irc) type=IRCClient;;
851 mail) type=Email;; 826 mail) type=Email;;
852 news) type=News;; 827 news) type=News;;
853 nntp) type=News;; 828 nntp) type=News;;
854 p2p) type=FileTransfer;; 829 p2p) type=FileTransfer;;
855 *) type=;; 830 *) type=;;
856 esac 831 esac
857 type="Network;${type}" 832 type="Network;${type}"
858 ;; 833 ;;
859 834
860 sci) 835 sci)
861 case ${catmin} in 836 case ${catmin} in
862 astro*) type=Astronomy;; 837 astro*) type=Astronomy;;
863 bio*) type=Biology;; 838 bio*) type=Biology;;
864 calc*) type=Calculator;; 839 calc*) type=Calculator;;
865 chem*) type=Chemistry;; 840 chem*) type=Chemistry;;
841 elec*) type=Electronics;;
866 geo*) type=Geology;; 842 geo*) type=Geology;;
867 math*) type=Math;; 843 math*) type=Math;;
844 physics) type=Physics;;
845 visual*) type=DataVisualization;;
868 *) type=;; 846 *) type=;;
869 esac 847 esac
870 type="Science;${type}" 848 type="Science;${type}"
849 ;;
850
851 sys)
852 type="System"
871 ;; 853 ;;
872 854
873 www) 855 www)
874 case ${catmin} in 856 case ${catmin} in
875 client) type=WebBrowser;; 857 client) type=WebBrowser;;
876 *) type=;; 858 *) type=;;
877 esac 859 esac
878 type="Network" 860 type="Network"
879 ;; 861 ;;
880 862
881 *) 863 *)
886 if [ "${SLOT}" == "0" ] ; then 868 if [ "${SLOT}" == "0" ] ; then
887 local desktop_name="${PN}" 869 local desktop_name="${PN}"
888 else 870 else
889 local desktop_name="${PN}-${SLOT}" 871 local desktop_name="${PN}-${SLOT}"
890 fi 872 fi
891 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 873 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
892# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 874 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
893 875
876 cat <<-EOF > "${desktop}"
894echo "[Desktop Entry] 877 [Desktop Entry]
895Encoding=UTF-8 878 Encoding=UTF-8
896Version=0.9.2 879 Version=1.0
897Name=${name} 880 Name=${name}
898Type=Application 881 Type=Application
899Comment=${DESCRIPTION} 882 Comment=${DESCRIPTION}
900Exec=${exec} 883 Exec=${exec}
901TryExec=${exec%% *} 884 TryExec=${exec%% *}
902Path=${path} 885 Path=${path}
903Icon=${icon} 886 Icon=${icon}
904Categories=Application;${type};" > "${desktop}" 887 Categories=${type};
888 EOF
905 889
906 ( 890 (
907 # wrap the env here so that the 'insinto' call 891 # wrap the env here so that the 'insinto' call
908 # doesn't corrupt the env of the caller 892 # doesn't corrupt the env of the caller
909 insinto /usr/share/applications 893 insinto /usr/share/applications
910 doins "${desktop}" 894 doins "${desktop}"
911 ) 895 )
912} 896}
913 897
914# Make a GDM/KDM Session file 898# @FUNCTION: validate_desktop_entries
915# 899# @USAGE: [directories]
916# make_desktop_entry(<title>, <command>) 900# @MAINTAINER:
917# title: File to execute to start the Window Manager 901# Carsten Lohrke <carlo@gentoo.org>
918# command: Name of the Window Manager 902# @DESCRIPTION:
903# Validate desktop entries using desktop-file-utils
904validate_desktop_entries() {
905 if [[ -x /usr/bin/desktop-file-validate ]] ; then
906 einfo "Checking desktop entry validity"
907 local directories=""
908 for d in /usr/share/applications $@ ; do
909 [[ -d ${D}${d} ]] && directories="${directories} ${D}${d}"
910 done
911 if [[ -n ${directories} ]] ; then
912 for FILE in $(find ${directories} -name "*\.desktop" \
913 -not -path '*.hidden*' | sort -u 2>/dev/null)
914 do
915 local temp=$(desktop-file-validate ${FILE} | grep -v "warning:" | \
916 sed -e "s|error: ||" -e "s|${FILE}:|--|g" )
917 [[ -n $temp ]] && elog ${temp/--/${FILE/${D}/}:}
918 done
919 fi
920 echo ""
921 else
922 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
923 fi
924}
919 925
926# @FUNCTION: make_session_desktop
927# @USAGE: <title> <command>
928# @DESCRIPTION:
929# Make a GDM/KDM Session file. The title is the file to execute to start the
930# Window Manager. The command is the name of the Window Manager.
920make_session_desktop() { 931make_session_desktop() {
921 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 932 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
922 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1 933 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
923 934
924 local title=$1 935 local title=$1
925 local command=$2 936 local command=$2
926 local desktop=${T}/${wm}.desktop 937 local desktop=${T}/${wm}.desktop
927 938
939 cat <<-EOF > "${desktop}"
928echo "[Desktop Entry] 940 [Desktop Entry]
929Encoding=UTF-8 941 Encoding=UTF-8
930Name=${title} 942 Name=${title}
931Comment=This session logs you into ${title} 943 Comment=This session logs you into ${title}
932Exec=${command} 944 Exec=${command}
933TryExec=${command} 945 TryExec=${command}
934Type=Application" > "${desktop}" 946 Type=Application
947 EOF
935 948
949 (
950 # wrap the env here so that the 'insinto' call
951 # doesn't corrupt the env of the caller
936 insinto /usr/share/xsessions 952 insinto /usr/share/xsessions
937 doins "${desktop}" 953 doins "${desktop}"
954 )
938} 955}
939 956
957# @FUNCTION: domenu
958# @USAGE: <menus>
959# @DESCRIPTION:
960# Install the list of .desktop menu files into the appropriate directory
961# (/usr/share/applications).
940domenu() { 962domenu() {
963 (
964 # wrap the env here so that the 'insinto' call
965 # doesn't corrupt the env of the caller
941 local i j 966 local i j ret=0
942 insinto /usr/share/applications 967 insinto /usr/share/applications
943 for i in "$@" ; do 968 for i in "$@" ; do
944 if [[ -f ${i} ]] ; then 969 if [[ -f ${i} ]] ; then
945 doins "${i}" 970 doins "${i}"
971 ((ret+=$?))
946 elif [[ -d ${i} ]] ; then 972 elif [[ -d ${i} ]] ; then
947 for j in "${i}"/*.desktop ; do 973 for j in "${i}"/*.desktop ; do
948 doins "${j}" 974 doins "${j}"
975 ((ret+=$?))
949 done 976 done
950 fi 977 fi
951 done 978 done
979 exit ${ret}
980 )
952} 981}
982
983# @FUNCTION: newmenu
984# @USAGE: <menu> <newname>
985# @DESCRIPTION:
986# Like all other new* functions, install the specified menu as newname.
953newmenu() { 987newmenu() {
988 (
989 # wrap the env here so that the 'insinto' call
990 # doesn't corrupt the env of the caller
954 insinto /usr/share/applications 991 insinto /usr/share/applications
955 newins "$1" "$2" 992 newins "$@"
993 )
956} 994}
957 995
996# @FUNCTION: doicon
997# @USAGE: <list of icons>
998# @DESCRIPTION:
999# Install the list of icons into the icon directory (/usr/share/pixmaps).
1000# This is useful in conjunction with creating desktop/menu files.
958doicon() { 1001doicon() {
1002 (
1003 # wrap the env here so that the 'insinto' call
1004 # doesn't corrupt the env of the caller
959 local i j 1005 local i j ret
960 insinto /usr/share/pixmaps 1006 insinto /usr/share/pixmaps
961 for i in "$@" ; do 1007 for i in "$@" ; do
962 if [[ -f ${i} ]] ; then 1008 if [[ -f ${i} ]] ; then
963 doins "${i}" 1009 doins "${i}"
1010 ((ret+=$?))
964 elif [[ -d ${i} ]] ; then 1011 elif [[ -d ${i} ]] ; then
965 for j in "${i}"/*.png ; do 1012 for j in "${i}"/*.png ; do
966 doins "${j}" 1013 doins "${j}"
1014 ((ret+=$?))
967 done 1015 done
968 fi 1016 fi
969 done 1017 done
1018 exit ${ret}
1019 )
970} 1020}
1021
1022# @FUNCTION: newicon
1023# @USAGE: <icon> <newname>
1024# @DESCRIPTION:
1025# Like all other new* functions, install the specified icon as newname.
971newicon() { 1026newicon() {
1027 (
1028 # wrap the env here so that the 'insinto' call
1029 # doesn't corrupt the env of the caller
972 insinto /usr/share/pixmaps 1030 insinto /usr/share/pixmaps
973 newins "$1" "$2" 1031 newins "$@"
1032 )
974} 1033}
975
976##############################################################
977# END: Handle .desktop files and menu entries #
978##############################################################
979
980 1034
981# for internal use only (unpack_pdv and unpack_makeself) 1035# for internal use only (unpack_pdv and unpack_makeself)
982find_unpackable_file() { 1036find_unpackable_file() {
983 local src=$1 1037 local src=$1
984 if [[ -z ${src} ]] ; then 1038 if [[ -z ${src} ]] ; then
994 fi 1048 fi
995 [[ ! -e ${src} ]] && return 1 1049 [[ ! -e ${src} ]] && return 1
996 echo "${src}" 1050 echo "${src}"
997} 1051}
998 1052
1053# @FUNCTION: unpack_pdv
1054# @USAGE: <file to unpack> <size of off_t>
1055# @DESCRIPTION:
999# Unpack those pesky pdv generated files ... 1056# Unpack those pesky pdv generated files ...
1000# They're self-unpacking programs with the binary package stuffed in 1057# They're self-unpacking programs with the binary package stuffed in
1001# the middle of the archive. Valve seems to use it a lot ... too bad 1058# the middle of the archive. Valve seems to use it a lot ... too bad
1002# it seems to like to segfault a lot :(. So lets take it apart ourselves. 1059# it seems to like to segfault a lot :(. So lets take it apart ourselves.
1003# 1060#
1004# Usage: unpack_pdv [file to unpack] [size of off_t]
1005# - you have to specify the off_t size ... i have no idea how to extract that 1061# You have to specify the off_t size ... I have no idea how to extract that
1006# information out of the binary executable myself. basically you pass in 1062# information out of the binary executable myself. Basically you pass in
1007# the size of the off_t type (in bytes) on the machine that built the pdv 1063# the size of the off_t type (in bytes) on the machine that built the pdv
1064# archive.
1065#
1008# archive. one way to determine this is by running the following commands: 1066# One way to determine this is by running the following commands:
1009# strings <pdv archive> | grep lseek 1067# strings <pdv archive> | grep lseek
1010# strace -elseek <pdv archive> 1068# strace -elseek <pdv archive>
1011# basically look for the first lseek command (we do the strings/grep because 1069# Basically look for the first lseek command (we do the strings/grep because
1012# sometimes the function call is _llseek or something) and steal the 2nd 1070# sometimes the function call is _llseek or something) and steal the 2nd
1013# parameter. here is an example: 1071# parameter. Here is an example:
1014# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1072# vapier@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1015# lseek 1073# lseek
1016# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1074# vapier@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1017# lseek(3, -4, SEEK_END) = 2981250 1075# lseek(3, -4, SEEK_END) = 2981250
1018# thus we would pass in the value of '4' as the second parameter. 1076# Thus we would pass in the value of '4' as the second parameter.
1019unpack_pdv() { 1077unpack_pdv() {
1020 local src=$(find_unpackable_file $1) 1078 local src=$(find_unpackable_file "$1")
1021 local sizeoff_t=$2 1079 local sizeoff_t=$2
1022 1080
1023 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1081 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1024 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :(" 1082 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1025 1083
1026 local shrtsrc=$(basename "${src}") 1084 local shrtsrc=$(basename "${src}")
1027 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1085 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1028 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1086 local metaskip=$(tail -c ${sizeoff_t} "${src}" | hexdump -e \"%i\")
1029 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1087 local tailskip=$(tail -c $((${sizeoff_t}*2)) "${src}" | head -c ${sizeoff_t} | hexdump -e \"%i\")
1030 1088
1031 # grab metadata for debug reasons 1089 # grab metadata for debug reasons
1032 local metafile="$(emktemp)" 1090 local metafile=$(emktemp)
1033 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1091 tail -c +$((${metaskip}+1)) "${src}" > "${metafile}"
1034 1092
1035 # rip out the final file name from the metadata 1093 # rip out the final file name from the metadata
1036 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1094 local datafile=$(tail -c +$((${metaskip}+1)) "${src}" | strings | head -n 1)
1037 datafile="`basename ${datafile}`" 1095 datafile=$(basename "${datafile}")
1038 1096
1039 # now lets uncompress/untar the file if need be 1097 # now lets uncompress/untar the file if need be
1040 local tmpfile="$(emktemp)" 1098 local tmpfile=$(emktemp)
1041 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1099 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1042 1100
1043 local iscompressed="`file -b ${tmpfile}`" 1101 local iscompressed=$(file -b "${tmpfile}")
1044 if [ "${iscompressed:0:8}" == "compress" ] ; then 1102 if [[ ${iscompressed:0:8} == "compress" ]] ; then
1045 iscompressed=1 1103 iscompressed=1
1046 mv ${tmpfile}{,.Z} 1104 mv ${tmpfile}{,.Z}
1047 gunzip ${tmpfile} 1105 gunzip ${tmpfile}
1048 else 1106 else
1049 iscompressed=0 1107 iscompressed=0
1050 fi 1108 fi
1051 local istar="`file -b ${tmpfile}`" 1109 local istar=$(file -b "${tmpfile}")
1052 if [ "${istar:0:9}" == "POSIX tar" ] ; then 1110 if [[ ${istar:0:9} == "POSIX tar" ]] ; then
1053 istar=1 1111 istar=1
1054 else 1112 else
1055 istar=0 1113 istar=0
1056 fi 1114 fi
1057 1115
1085 true 1143 true
1086 #[ -s "${datafile}" ] || die "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')" 1144 #[ -s "${datafile}" ] || die "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')"
1087 #assert "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')" 1145 #assert "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')"
1088} 1146}
1089 1147
1148# @FUNCTION: unpack_makeself
1149# @USAGE: [file to unpack] [offset] [tail|dd]
1150# @DESCRIPTION:
1090# Unpack those pesky makeself generated files ... 1151# Unpack those pesky makeself generated files ...
1091# They're shell scripts with the binary package tagged onto 1152# They're shell scripts with the binary package tagged onto
1092# the end of the archive. Loki utilized the format as does 1153# the end of the archive. Loki utilized the format as does
1093# many other game companies. 1154# many other game companies.
1094# 1155#
1095# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1156# If the file is not specified, then ${A} is used. If the
1096# - If the file is not specified then unpack will utilize ${A}.
1097# - If the offset is not specified then we will attempt to extract 1157# offset is not specified then we will attempt to extract
1098# the proper offset from the script itself. 1158# the proper offset from the script itself.
1099unpack_makeself() { 1159unpack_makeself() {
1100 local src_input=${1:-${A}} 1160 local src_input=${1:-${A}}
1101 local src=$(find_unpackable_file "${src_input}") 1161 local src=$(find_unpackable_file "${src_input}")
1102 local skip=$2 1162 local skip=$2
1103 local exe=$3 1163 local exe=$3
1149 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1209 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1150 *) die "makeself cant handle exe '${exe}'" 1210 *) die "makeself cant handle exe '${exe}'"
1151 esac 1211 esac
1152 1212
1153 # lets grab the first few bytes of the file to figure out what kind of archive it is 1213 # lets grab the first few bytes of the file to figure out what kind of archive it is
1154 local tmpfile="$(emktemp)" 1214 local tmpfile=$(emktemp)
1155 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1215 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1156 local filetype="$(file -b "${tmpfile}")" 1216 local filetype=$(file -b "${tmpfile}")
1157 case ${filetype} in 1217 case ${filetype} in
1158 *tar\ archive) 1218 *tar\ archive*)
1159 eval ${exe} | tar --no-same-owner -xf - 1219 eval ${exe} | tar --no-same-owner -xf -
1160 ;; 1220 ;;
1161 bzip2*) 1221 bzip2*)
1162 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1222 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1163 ;; 1223 ;;
1173 ;; 1233 ;;
1174 esac 1234 esac
1175 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})" 1235 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})"
1176} 1236}
1177 1237
1238# @FUNCTION: check_license
1239# @USAGE: [license]
1240# @DESCRIPTION:
1178# Display a license for user to accept. 1241# Display a license for user to accept. If no license is
1179#
1180# Usage: check_license [license]
1181# - If the file is not specified then ${LICENSE} is used. 1242# specified, then ${LICENSE} is used.
1182check_license() { 1243check_license() {
1183 local lic=$1 1244 local lic=$1
1184 if [ -z "${lic}" ] ; then 1245 if [ -z "${lic}" ] ; then
1185 lic="${PORTDIR}/licenses/${LICENSE}" 1246 lic="${PORTDIR}/licenses/${LICENSE}"
1186 else 1247 else
1199 # accepted ... if we don't find a match, we make the user accept 1260 # accepted ... if we don't find a match, we make the user accept
1200 local shopts=$- 1261 local shopts=$-
1201 local alic 1262 local alic
1202 set -o noglob #so that bash doesn't expand "*" 1263 set -o noglob #so that bash doesn't expand "*"
1203 for alic in ${ACCEPT_LICENSE} ; do 1264 for alic in ${ACCEPT_LICENSE} ; do
1204 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1265 if [[ ${alic} == ${l} ]]; then
1205 set +o noglob; set -${shopts} #reset old shell opts 1266 set +o noglob; set -${shopts} #reset old shell opts
1206 return 0 1267 return 0
1207 fi 1268 fi
1208 done 1269 done
1209 set +o noglob; set -$shopts #reset old shell opts 1270 set +o noglob; set -$shopts #reset old shell opts
1210 1271
1211 local licmsg="$(emktemp)" 1272 local licmsg=$(emktemp)
1212 cat << EOF > ${licmsg} 1273 cat <<-EOF > ${licmsg}
1213********************************************************** 1274 **********************************************************
1214The following license outlines the terms of use of this 1275 The following license outlines the terms of use of this
1215package. You MUST accept this license for installation to 1276 package. You MUST accept this license for installation to
1216continue. When you are done viewing, hit 'q'. If you 1277 continue. When you are done viewing, hit 'q'. If you
1217CTRL+C out of this, the install will not run! 1278 CTRL+C out of this, the install will not run!
1218********************************************************** 1279 **********************************************************
1219 1280
1220EOF 1281 EOF
1221 cat ${lic} >> ${licmsg} 1282 cat ${lic} >> ${licmsg}
1222 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}" 1283 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}"
1223 einfon "Do you accept the terms of this license (${l})? [yes/no] " 1284 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1224 read alic 1285 read alic
1225 case ${alic} in 1286 case ${alic} in
1232 die "Failed to accept license" 1293 die "Failed to accept license"
1233 ;; 1294 ;;
1234 esac 1295 esac
1235} 1296}
1236 1297
1298# @FUNCTION: cdrom_get_cds
1299# @USAGE: <file on cd1> [file on cd2] [file on cd3] [...]
1300# @DESCRIPTION:
1237# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates 1301# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates
1238# the whole 'non-interactive' policy, but damnit I want CD support ! 1302# the whole 'non-interactive' policy, but damnit I want CD support !
1239# 1303#
1240# with these cdrom functions we handle all the user interaction and 1304# With these cdrom functions we handle all the user interaction and
1241# standardize everything. all you have to do is call cdrom_get_cds() 1305# standardize everything. All you have to do is call cdrom_get_cds()
1242# and when the function returns, you can assume that the cd has been 1306# and when the function returns, you can assume that the cd has been
1243# found at CDROM_ROOT. 1307# found at CDROM_ROOT.
1244# 1308#
1309# The function will attempt to locate a cd based upon a file that is on
1310# the cd. The more files you give this function, the more cds
1311# the cdrom functions will handle.
1312#
1245# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1313# Normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1246# etc... if you want to give the cds better names, then just export 1314# etc... If you want to give the cds better names, then just export
1247# the appropriate CDROM_NAME variable before calling cdrom_get_cds(). 1315# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1248# - CDROM_NAME="fooie cd" - for when you only want 1 cd 1316# Use CDROM_NAME for one cd, or CDROM_NAME_# for multiple cds. You can
1249# - CDROM_NAME_1="install cd" - for when you want more than 1 cd 1317# also use the CDROM_NAME_SET bash array.
1250# CDROM_NAME_2="data cd" 1318#
1251# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1252#
1253# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1319# For those multi cd ebuilds, see the cdrom_load_next_cd() function.
1254#
1255# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1256# - this will attempt to locate a cd based upon a file that is on
1257# the cd ... the more files you give this function, the more cds
1258# the cdrom functions will handle
1259cdrom_get_cds() { 1320cdrom_get_cds() {
1260 # first we figure out how many cds we're dealing with by 1321 # first we figure out how many cds we're dealing with by
1261 # the # of files they gave us 1322 # the # of files they gave us
1262 local cdcnt=0 1323 local cdcnt=0
1263 local f= 1324 local f=
1349 export CDROM_SET="" 1410 export CDROM_SET=""
1350 export CDROM_CURRENT_CD=0 1411 export CDROM_CURRENT_CD=0
1351 cdrom_load_next_cd 1412 cdrom_load_next_cd
1352} 1413}
1353 1414
1354# this is only used when you need access to more than one cd. 1415# @FUNCTION: cdrom_load_next_cd
1355# when you have finished using the first cd, just call this function. 1416# @DESCRIPTION:
1356# when it returns, CDROM_ROOT will be pointing to the second cd. 1417# Some packages are so big they come on multiple CDs. When you're done reading
1357# remember, you can only go forward in the cd chain, you can't go back. 1418# files off a CD and want access to the next one, just call this function.
1419# Again, all the messy details of user interaction are taken care of for you.
1420# Once this returns, just read the variable CDROM_ROOT for the location of the
1421# mounted CD. Note that you can only go forward in the CD list, so make sure
1422# you only call this function when you're done using the current CD.
1358cdrom_load_next_cd() { 1423cdrom_load_next_cd() {
1359 local var 1424 local var
1360 ((++CDROM_CURRENT_CD)) 1425 ((++CDROM_CURRENT_CD))
1361 1426
1362 unset CDROM_ROOT 1427 unset CDROM_ROOT
1392 1457
1393 while [[ -n ${cdset[${i}]} ]] ; do 1458 while [[ -n ${cdset[${i}]} ]] ; do
1394 local dir=$(dirname ${cdset[${i}]}) 1459 local dir=$(dirname ${cdset[${i}]})
1395 local file=$(basename ${cdset[${i}]}) 1460 local file=$(basename ${cdset[${i}]})
1396 1461
1397 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do 1462 local point= node= fs= foo=
1398 [[ -d ${mline}/${dir} ]] || continue 1463 while read point node fs foo ; do
1464 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \
1465 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1466 && continue
1467 point=${point//\040/ }
1399 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then 1468 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1400 export CDROM_ROOT=${mline} 1469 export CDROM_ROOT=${point}
1401 export CDROM_SET=${i} 1470 export CDROM_SET=${i}
1402 export CDROM_MATCH=${cdset[${i}]} 1471 export CDROM_MATCH=${cdset[${i}]}
1403 return 1472 return
1404 fi 1473 done <<< "$(get_mounts)"
1405 done
1406 1474
1407 ((++i)) 1475 ((++i))
1408 done 1476 done
1409 1477
1410 echo 1478 echo
1438 1506
1439# Make sure that LINGUAS only contains languages that 1507# Make sure that LINGUAS only contains languages that
1440# a package can support 1508# a package can support
1441# 1509#
1442# usage: strip-linguas <allow LINGUAS> 1510# usage: strip-linguas <allow LINGUAS>
1443# strip-linguas -i <directories of .po files> 1511# strip-linguas -i <directories of .po files>
1444# strip-linguas -u <directories of .po files> 1512# strip-linguas -u <directories of .po files>
1445# 1513#
1446# The first form allows you to specify a list of LINGUAS. 1514# The first form allows you to specify a list of LINGUAS.
1447# The -i builds a list of po files found in all the 1515# The -i builds a list of po files found in all the
1448# directories and uses the intersection of the lists. 1516# directories and uses the intersection of the lists.
1449# The -u builds a list of po files found in all the 1517# The -u builds a list of po files found in all the
1450# directories and uses the union of the lists. 1518# directories and uses the union of the lists.
1451strip-linguas() { 1519strip-linguas() {
1452 local ls newls nols 1520 local ls newls nols
1453 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1521 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1454 local op=$1; shift 1522 local op=$1; shift
1455 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1523 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1485 [[ -n ${nols} ]] \ 1553 [[ -n ${nols} ]] \
1486 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1554 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1487 export LINGUAS=${newls:1} 1555 export LINGUAS=${newls:1}
1488} 1556}
1489 1557
1490# moved from kernel.eclass since they are generally useful outside of 1558# @FUNCTION: set_arch_to_kernel
1491# kernel.eclass -iggy (20041002) 1559# @DESCRIPTION:
1492
1493# the following functions are useful in kernel module ebuilds, etc.
1494# for an example see ivtv or drbd ebuilds
1495
1496# set's ARCH to match what the kernel expects 1560# Set the env ARCH to match what the kernel expects.
1497set_arch_to_kernel() { 1561set_arch_to_kernel() {
1498 i=10 1562 i=10
1499 while ((i--)) ; do 1563 while ((i--)) ; do
1500 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1564 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1501 done 1565 done
1502 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1566 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1503 case ${ARCH} in 1567 case ${ARCH} in
1504 x86) export ARCH="i386";; 1568 x86) export ARCH="i386";;
1505 amd64) export ARCH="x86_64";; 1569 amd64) export ARCH="x86_64";;
1506 hppa) export ARCH="parisc";; 1570 hppa) export ARCH="parisc";;
1507 mips) export ARCH="mips";; 1571 mips) export ARCH="mips";;
1508 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! 1572 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!
1509 *) export ARCH="${ARCH}";; 1573 *) export ARCH="${ARCH}";;
1510 esac 1574 esac
1511} 1575}
1512 1576
1513# set's ARCH back to what portage expects 1577# @FUNCTION: set_arch_to_portage
1578# @DESCRIPTION:
1579# Set the env ARCH to match what portage expects.
1514set_arch_to_portage() { 1580set_arch_to_portage() {
1515 i=10 1581 i=10
1516 while ((i--)) ; do 1582 while ((i--)) ; do
1517 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1583 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1518 done 1584 done
1519 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1585 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1520} 1586}
1521 1587
1522# Jeremy Huddleston <eradicator@gentoo.org>: 1588# @FUNCTION: preserve_old_lib
1523# preserve_old_lib /path/to/libblah.so.0 1589# @USAGE: <libs to preserve> [more libs]
1524# preserve_old_lib_notify /path/to/libblah.so.0 1590# @DESCRIPTION:
1525#
1526# These functions are useful when a lib in your package changes --library. Such 1591# These functions are useful when a lib in your package changes ABI SONAME.
1527# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1592# An example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1528# would break packages that link against it. Most people get around this 1593# would break packages that link against it. Most people get around this
1529# by using the portage SLOT mechanism, but that is not always a relevant 1594# by using the portage SLOT mechanism, but that is not always a relevant
1530# solution, so instead you can add the following to your ebuilds: 1595# solution, so instead you can call this from pkg_preinst. See also the
1531# 1596# preserve_old_lib_notify function.
1532# src_install() {
1533# ...
1534# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1535# ...
1536# }
1537#
1538# pkg_postinst() {
1539# ...
1540# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1541# ...
1542# }
1543
1544preserve_old_lib() { 1597preserve_old_lib() {
1545 LIB=$1 1598 if [[ ${EBUILD_PHASE} != "preinst" ]] ; then
1599 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1600 die "Invalid preserve_old_lib() usage"
1601 fi
1602 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1546 1603
1547 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1604 local lib dir
1548 SONAME=`basename ${LIB}` 1605 for lib in "$@" ; do
1549 DIRNAME=`dirname ${LIB}` 1606 [[ -e ${ROOT}/${lib} ]] || continue
1550 1607 dir=${lib%/*}
1551 dodir ${DIRNAME} 1608 dodir ${dir} || die "dodir ${dir} failed"
1552 cp ${ROOT}${LIB} ${D}${DIRNAME} 1609 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
1553 touch ${D}${LIB} 1610 touch "${D}"/${lib}
1554 fi 1611 done
1555} 1612}
1556 1613
1614# @FUNCTION: preserve_old_lib_notify
1615# @USAGE: <libs to notify> [more libs]
1616# @DESCRIPTION:
1617# Spit helpful messages about the libraries preserved by preserve_old_lib.
1557preserve_old_lib_notify() { 1618preserve_old_lib_notify() {
1558 LIB=$1 1619 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1620 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1621 die "Invalid preserve_old_lib_notify() usage"
1622 fi
1559 1623
1560 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1624 local lib notice=0
1561 SONAME=`basename ${LIB}` 1625 for lib in "$@" ; do
1562 1626 [[ -e ${ROOT}/${lib} ]] || continue
1627 if [[ ${notice} -eq 0 ]] ; then
1628 notice=1
1563 ewarn "An old version of an installed library was detected on your system." 1629 ewarn "Old versions of installed libraries were detected on your system."
1564 ewarn "In order to avoid breaking packages that link against it, this older version" 1630 ewarn "In order to avoid breaking packages that depend on these old libs,"
1565 ewarn "is not being removed. In order to make full use of this newer version," 1631 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1566 ewarn "you will need to execute the following command:" 1632 ewarn "in order to remove these old dependencies. If you do not have this"
1567 ewarn " revdep-rebuild --library ${SONAME}" 1633 ewarn "helper program, simply emerge the 'gentoolkit' package."
1568 ewarn 1634 ewarn
1569 ewarn "After doing that, you can safely remove ${LIB}"
1570 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1571 fi 1635 fi
1636 ewarn " # revdep-rebuild --library ${lib##*/}"
1637 done
1572} 1638}
1573 1639
1574# Hack for people to figure out if a package was built with 1640# @FUNCTION: built_with_use
1575# certain USE flags 1641# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1576# 1642# @DESCRIPTION:
1577# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1643# A temporary hack until portage properly supports DEPENDing on USE
1578# ex: built_with_use xchat gtk2 1644# flags being enabled in packages. This will check to see if the specified
1579# 1645# DEPEND atom was built with the specified list of USE flags. The
1580# Flags: -a all USE flags should be utilized 1646# --missing option controls the behavior if called on a package that does
1581# -o at least one USE flag should be utilized 1647# not actually support the defined USE flags (aka listed in IUSE).
1582# Note: the default flag is '-a' 1648# The default is to abort (call die). The -a and -o flags control
1649# the requirements of the USE flags. They correspond to "and" and "or"
1650# logic. So the -a flag means all listed USE flags must be enabled
1651# while the -o flag means at least one of the listed fIUSE flags must be
1652# enabled. The --hidden option is really for internal use only as it
1653# means the USE flag we're checking is hidden expanded, so it won't be found
1654# in IUSE like normal USE flags.
1655#
1656# Remember that this function isn't terribly intelligent so order of optional
1657# flags matter.
1583built_with_use() { 1658built_with_use() {
1659 local hidden="no"
1660 if [[ $1 == "--hidden" ]] ; then
1661 hidden="yes"
1662 shift
1663 fi
1664
1665 local missing_action="die"
1666 if [[ $1 == "--missing" ]] ; then
1667 missing_action=$2
1668 shift ; shift
1669 case ${missing_action} in
1670 true|false|die) ;;
1671 *) die "unknown action '${missing_action}'";;
1672 esac
1673 fi
1674
1584 local opt=$1 1675 local opt=$1
1585 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1676 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1586 1677
1587 local PKG=$(best_version $1) 1678 local PKG=$(best_version $1)
1679 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1588 shift 1680 shift
1589 1681
1590 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE 1682 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1683 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1591 1684
1592 # if the USE file doesnt exist, assume the $PKG is either 1685 # if the IUSE file doesn't exist, the read will error out, we need to handle
1593 # injected or package.provided 1686 # this gracefully
1594 [[ ! -e ${USEFILE} ]] && return 0 1687 if [[ ! -e ${USEFILE} ]] || [[ ! -e ${IUSEFILE} && ${hidden} == "no" ]] ; then
1688 case ${missing_action} in
1689 true) return 0;;
1690 false) return 1;;
1691 die) die "Unable to determine what USE flags $PKG was built with";;
1692 esac
1693 fi
1694
1695 if [[ ${hidden} == "no" ]] ; then
1696 local IUSE_BUILT=$(<${IUSEFILE})
1697 # Don't check USE_EXPAND #147237
1698 local expand
1699 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1700 if [[ $1 == ${expand}_* ]] ; then
1701 expand=""
1702 break
1703 fi
1704 done
1705 if [[ -n ${expand} ]] ; then
1706 if ! has $1 ${IUSE_BUILT} ; then
1707 case ${missing_action} in
1708 true) return 0;;
1709 false) return 1;;
1710 die) die "$PKG does not actually support the $1 USE flag!";;
1711 esac
1712 fi
1713 fi
1714 fi
1595 1715
1596 local USE_BUILT=$(<${USEFILE}) 1716 local USE_BUILT=$(<${USEFILE})
1597 while [[ $# -gt 0 ]] ; do 1717 while [[ $# -gt 0 ]] ; do
1598 if [[ ${opt} = "-o" ]] ; then 1718 if [[ ${opt} = "-o" ]] ; then
1599 has $1 ${USE_BUILT} && return 0 1719 has $1 ${USE_BUILT} && return 0
1603 shift 1723 shift
1604 done 1724 done
1605 [[ ${opt} = "-a" ]] 1725 [[ ${opt} = "-a" ]]
1606} 1726}
1607 1727
1728# @DESCRIPTION: epunt_cxx
1729# @USAGE: [dir to scan]
1730# @DESCRIPTION:
1608# Many configure scripts wrongly bail when a C++ compiler 1731# Many configure scripts wrongly bail when a C++ compiler could not be
1609# could not be detected. #73450 1732# detected. If dir is not specified, then it defaults to ${S}.
1733#
1734# http://bugs.gentoo.org/73450
1610epunt_cxx() { 1735epunt_cxx() {
1611 local dir=$1 1736 local dir=$1
1612 [[ -z ${dir} ]] && dir=${S} 1737 [[ -z ${dir} ]] && dir=${S}
1613 ebegin "Removing useless C++ checks" 1738 ebegin "Removing useless C++ checks"
1614 local f 1739 local f
1616 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1741 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1617 done 1742 done
1618 eend 0 1743 eend 0
1619} 1744}
1620 1745
1621# dopamd <file> [more files] 1746# @FUNCTION: make_wrapper
1622# 1747# @USAGE: <wrapper> <target> <chdir> [libpaths] [installpath]
1623# Install pam auth config file in /etc/pam.d 1748# @DESCRIPTION:
1624dopamd() { 1749# Create a shell wrapper script named wrapper in installpath
1625 [[ -z $1 ]] && die "dopamd requires at least one argument" 1750# (defaults to the bindir) to execute target (default of wrapper) by
1626 1751# first optionally setting LD_LIBRARY_PATH to the colon-delimited
1627 use pam || return 0 1752# libpaths followed by optionally changing directory to chdir.
1628
1629 INSDESTTREE=/etc/pam.d \
1630 doins "$@" || die "failed to install $@"
1631}
1632# newpamd <old name> <new name>
1633#
1634# Install pam file <old name> as <new name> in /etc/pam.d
1635newpamd() {
1636 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1637
1638 use pam || return 0
1639
1640 INSDESTTREE=/etc/pam.d \
1641 newins "$1" "$2" || die "failed to install $1 as $2"
1642}
1643
1644# make a wrapper script ...
1645# NOTE: this was originally games_make_wrapper, but I noticed other places where
1646# this could be used, so I have moved it here and made it not games-specific
1647# -- wolf31o2
1648# $1 == wrapper name
1649# $2 == binary to run
1650# $3 == directory to chdir before running binary
1651# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1652# $5 == path for wrapper
1653make_wrapper() { 1753make_wrapper() {
1654 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1754 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1655 local tmpwrapper=$(emktemp) 1755 local tmpwrapper=$(emktemp)
1656 # We don't want to quote ${bin} so that people can pass complex 1756 # We don't want to quote ${bin} so that people can pass complex
1657 # things as $bin ... "./someprog --args" 1757 # things as $bin ... "./someprog --args"
1667fi 1767fi
1668exec ${bin} "\$@" 1768exec ${bin} "\$@"
1669EOF 1769EOF
1670 chmod go+rx "${tmpwrapper}" 1770 chmod go+rx "${tmpwrapper}"
1671 if [[ -n ${path} ]] ; then 1771 if [[ -n ${path} ]] ; then
1772 (
1672 exeinto "${path}" 1773 exeinto "${path}"
1673 newexe "${tmpwrapper}" "${wrapper}" 1774 newexe "${tmpwrapper}" "${wrapper}"
1775 ) || die
1674 else 1776 else
1675 newbin "${tmpwrapper}" "${wrapper}" 1777 newbin "${tmpwrapper}" "${wrapper}" || die
1676 fi 1778 fi
1677} 1779}

Legend:
Removed from v.1.244  
changed lines
  Added in v.1.284

  ViewVC Help
Powered by ViewVC 1.1.20