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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20