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

Diff of /eclass/eutils.eclass

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

Revision 1.197 Revision 1.228
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2005 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.197 2005/09/18 17:33:44 flameeyes Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.228 2006/03/10 23:24:21 vapier Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
60# to point to the latest version of the library present. 60# to point to the latest version of the library present.
61# 61#
62# <azarah@gentoo.org> (26 Oct 2002) 62# <azarah@gentoo.org> (26 Oct 2002)
63# 63#
64gen_usr_ldscript() { 64gen_usr_ldscript() {
65 local libdir="$(get_libdir)" 65 local lib libdir=$(get_libdir)
66 # Just make sure it exists 66 # Just make sure it exists
67 dodir /usr/${libdir} 67 dodir /usr/${libdir}
68 68
69 for lib in "${@}" ; do 69 for lib in "${@}" ; do
70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
76 76
77 See bug http://bugs.gentoo.org/4411 for more info. 77 See bug http://bugs.gentoo.org/4411 for more info.
78 */ 78 */
79 GROUP ( /${libdir}/${lib} ) 79 GROUP ( /${libdir}/${lib} )
80 END_LDSCRIPT 80 END_LDSCRIPT
81 fperms a+x "/usr/${libdir}/${lib}" 81 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
82 done 82 done
83} 83}
84 84
85# Simple function to draw a line consisting of '=' the same length as $*
86# - only to be used by epatch()
87#
88# <azarah@gentoo.org> (11 Nov 2002)
89#
90draw_line() {
91 local i=0
92 local str_length=""
93
94 # Handle calls that do not have args, or wc not being installed ...
95 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
96 then
97 echo "==============================================================="
98 return 0
99 fi
100
101 # Get the length of $*
102 str_length="$(echo -n "$*" | wc -m)"
103
104 while [ "$i" -lt "${str_length}" ]
105 do
106 echo -n "="
107
108 i=$((i + 1))
109 done
110
111 echo
112
113 return 0
114}
115 85
116# Default directory where patches are located 86# Default directory where patches are located
117EPATCH_SOURCE="${WORKDIR}/patch" 87EPATCH_SOURCE="${WORKDIR}/patch"
118# Default extension for patches 88# Default extension for patches
119EPATCH_SUFFIX="patch.bz2" 89EPATCH_SUFFIX="patch.bz2"
166# hand its a directory, it will set EPATCH_SOURCE to this. 136# hand its a directory, it will set EPATCH_SOURCE to this.
167# 137#
168# <azarah@gentoo.org> (10 Nov 2002) 138# <azarah@gentoo.org> (10 Nov 2002)
169# 139#
170epatch() { 140epatch() {
141 _epatch_draw_line() {
142 # this func produces a lot of pointless noise when debugging is turned on ...
143 local is_debug=0
144 [[ $- == *x* ]] && is_debug=1 && set +x
145
146 local i=0 str_length="" str_out=""
147
148 # Handle calls that do not have args, or wc not being installed ...
149 if [[ -z $1 ]] || ! type -p wc >/dev/null ; then
150 str_length=65
151 else
152 str_length=$(echo -n "$*" | wc -m)
153 fi
154
155 while ((i++ < ${str_length})) ; do
156 str_out="${str_out}="
157 done
158 echo ${str_out}
159
160 [[ ${is_debug} -eq 1 ]] && set -x
161 return 0
162 }
163 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
171 local PIPE_CMD="" 164 local PIPE_CMD=""
172 local STDERR_TARGET="${T}/$$.out" 165 local STDERR_TARGET="${T}/$$.out"
173 local PATCH_TARGET="${T}/$$.patch" 166 local PATCH_TARGET="${T}/$$.patch"
174 local PATCH_SUFFIX="" 167 local PATCH_SUFFIX=""
175 local SINGLE_PATCH="no" 168 local SINGLE_PATCH="no"
284 277
285 # Allow for prefix to differ ... im lazy, so shoot me :/ 278 # Allow for prefix to differ ... im lazy, so shoot me :/
286 while [ "${count}" -lt 5 ] 279 while [ "${count}" -lt 5 ]
287 do 280 do
288 # Generate some useful debug info ... 281 # Generate some useful debug info ...
289 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
291 284
292 if [ "${PATCH_SUFFIX}" != "patch" ] 285 if [ "${PATCH_SUFFIX}" != "patch" ]
293 then 286 then
294 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 287 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
299 292
300 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 293 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 294 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 295
303 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 296 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
304 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 297 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
305 298
306 if [ "${PATCH_SUFFIX}" != "patch" ] 299 if [ "${PATCH_SUFFIX}" != "patch" ]
307 then 300 then
308 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 301 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
309 then 302 then
313 count=5 306 count=5
314 break 307 break
315 fi 308 fi
316 fi 309 fi
317 310
318 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 311 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
319 then 312 then
320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 313 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 314 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 315 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 316 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 317 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
325 318
326 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 319 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
320 _epatch_assert
327 321
328 if [ "$?" -ne 0 ] 322 if [ "$?" -ne 0 ]
329 then 323 then
330 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 324 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
331 echo 325 echo
394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 388 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
395 done 389 done
396 ${exe} "${tmp}" || ${exe} -p "${tmp}" 390 ${exe} "${tmp}" || ${exe} -p "${tmp}"
397 echo "${tmp}" 391 echo "${tmp}"
398 else 392 else
399 [[ ${exe} == "touch" ]] \ 393 if [[ ${exe} == "touch" ]] ; then
400 && exe="-p" \ 394 [[ ${USERLAND} == "GNU" ]] \
401 || exe="-d" 395 && mktemp -p "${topdir}" \
402 mktemp ${exe} "${topdir}" 396 || TMPDIR="${topdir}" mktemp -t tmp
397 else
398 [[ ${USERLAND} == "GNU" ]] \
399 && mktemp -d "${topdir}" \
400 || TMPDIR="${topdir}" mktemp -dt tmp
401 fi
403 fi 402 fi
404} 403}
405 404
406# Small wrapper for getent (Linux), nidump (Mac OS X), 405# Small wrapper for getent (Linux), nidump (Mac OS X),
407# and pw (FreeBSD) used in enewuser()/enewgroup() 406# and pw (FreeBSD) used in enewuser()/enewgroup()
408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 407# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 408# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
410# 409#
411# egetent(database, key) 410# egetent(database, key)
412egetent() { 411egetent() {
413 if [[ "${USERLAND}" == "Darwin" ]] ; then 412 case ${CHOST} in
413 *-darwin*)
414 case "$2" in 414 case "$2" in
415 *[!0-9]*) # Non numeric 415 *[!0-9]*) # Non numeric
416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
417 ;; 417 ;;
418 *) # Numeric 418 *) # Numeric
419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
420 ;; 420 ;;
421 esac 421 esac
422 elif [[ "${USERLAND}" == "BSD" ]] ; then 422 ;;
423 local action 423 *-freebsd*|*-dragonfly*)
424 if [ "$1" == "passwd" ] 424 local opts action="user"
425 then 425 [[ $1 == "passwd" ]] || action="group"
426 action="user" 426
427 else 427 # lookup by uid/gid
428 action="group" 428 if [[ $2 == [[:digit:]]* ]] ; then
429 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
429 fi 430 fi
431
430 pw show "${action}" "$2" -q 432 pw show ${action} ${opts} "$2" -q
431 else 433 ;;
434 *-netbsd*|*-openbsd*)
435 grep "$2:\*:" /etc/$1
436 ;;
437 *)
432 which nscd >& /dev/null && nscd -i "$1" 438 type -p nscd >& /dev/null && nscd -i "$1"
433 getent "$1" "$2" 439 getent "$1" "$2"
434 fi 440 ;;
441 esac
435} 442}
436 443
437# Simplify/standardize adding users to the system 444# Simplify/standardize adding users to the system
438# vapier@gentoo.org 445# vapier@gentoo.org
439# 446#
487 einfo " - Userid: ${euid}" 494 einfo " - Userid: ${euid}"
488 495
489 # handle shell 496 # handle shell
490 local eshell=$1; shift 497 local eshell=$1; shift
491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 498 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
492 if [[ ! -e ${eshell} ]] ; then 499 if [[ ! -e ${ROOT}${eshell} ]] ; then
493 eerror "A shell was specified but it does not exist !" 500 eerror "A shell was specified but it does not exist !"
494 die "${eshell} does not exist" 501 die "${eshell} does not exist in ${ROOT}"
495 fi 502 fi
503 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
504 eerror "Do not specify ${eshell} yourself, use -1"
505 die "Pass '-1' as the shell parameter"
506 fi
496 else 507 else
497 case ${USERLAND} in 508 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
498 Darwin) eshell="/usr/bin/false";; 509 [[ -x ${ROOT}${shell} ]] && break
499 BSD) eshell="/usr/sbin/nologin";; 510 done
500 *) eshell="/bin/false";; 511
501 esac 512 if [[ ${shell} == "/dev/null" ]] ; then
513 eerror "Unable to identify the shell to use"
514 die "Unable to identify the shell to use"
515 fi
516
517 eshell=${shell}
502 fi 518 fi
503 einfo " - Shell: ${eshell}" 519 einfo " - Shell: ${eshell}"
504 opts="${opts} -s ${eshell}" 520 opts="${opts} -s ${eshell}"
505 521
506 # handle homedir 522 # handle homedir
543 einfo " - Groups: ${egroups}" 559 einfo " - Groups: ${egroups}"
544 560
545 # handle extra and add the user 561 # handle extra and add the user
546 local oldsandbox=${SANDBOX_ON} 562 local oldsandbox=${SANDBOX_ON}
547 export SANDBOX_ON="0" 563 export SANDBOX_ON="0"
548 case ${USERLAND} in 564 case ${CHOST} in
549 Darwin) 565 *-darwin*)
550 ### Make the user 566 ### Make the user
551 if [[ -z $@ ]] ; then 567 if [[ -z $@ ]] ; then
552 dscl . create /users/${euser} uid ${euid} 568 dscl . create /users/${euser} uid ${euid}
553 dscl . create /users/${euser} shell ${eshell} 569 dscl . create /users/${euser} shell ${eshell}
554 dscl . create /users/${euser} home ${ehome} 570 dscl . create /users/${euser} home ${ehome}
565 einfo "Please report the ebuild along with the info below" 581 einfo "Please report the ebuild along with the info below"
566 einfo "eextra: $@" 582 einfo "eextra: $@"
567 die "Required function missing" 583 die "Required function missing"
568 fi 584 fi
569 ;; 585 ;;
570 BSD) 586 *-freebsd*|*-dragonfly*)
571 if [[ -z $@ ]] ; then 587 if [[ -z $@ ]] ; then
572 pw useradd ${euser} ${opts} \ 588 pw useradd ${euser} ${opts} \
573 -c "added by portage for ${PN}" \ 589 -c "added by portage for ${PN}" \
574 die "enewuser failed" 590 die "enewuser failed"
575 else 591 else
576 einfo " - Extra: $@" 592 einfo " - Extra: $@"
577 pw useradd ${euser} ${opts} \ 593 pw useradd ${euser} ${opts} \
578 "$@" || die "enewuser failed" 594 "$@" || die "enewuser failed"
579 fi 595 fi
580 ;; 596 ;;
597
598 *-netbsd*)
599 if [[ -z $@ ]] ; then
600 useradd ${opts} ${euser} || die "enewuser failed"
601 else
602 einfo " - Extra: $@"
603 useradd ${opts} ${euser} "$@" || die "enewuser failed"
604 fi
605 ;;
606
607 *-openbsd*)
608 if [[ -z $@ ]] ; then
609 useradd -u ${euid} -s ${eshell} \
610 -d ${ehome} -c "Added by portage for ${PN}" \
611 -g ${egroups} ${euser} || die "enewuser failed"
612 else
613 einfo " - Extra: $@"
614 useradd -u ${euid} -s ${eshell} \
615 -d ${ehome} -c "Added by portage for ${PN}" \
616 -g ${egroups} ${euser} "$@" || die "enewuser failed"
617 fi
618 ;;
619
581 *) 620 *)
582 if [[ -z $@ ]] ; then 621 if [[ -z $@ ]] ; then
583 useradd ${opts} ${euser} \ 622 useradd ${opts} ${euser} \
584 -c "added by portage for ${PN}" \ 623 -c "added by portage for ${PN}" \
585 || die "enewuser failed" 624 || die "enewuser failed"
635 then 674 then
636 if [ "${egid}" -gt 0 ] 675 if [ "${egid}" -gt 0 ]
637 then 676 then
638 if [ -z "`egetent group ${egid}`" ] 677 if [ -z "`egetent group ${egid}`" ]
639 then 678 then
640 if [[ "${USERLAND}" == "Darwin" ]]; then 679 if [[ "${CHOST}" == *-darwin* ]]; then
641 opts="${opts} ${egid}" 680 opts="${opts} ${egid}"
642 else 681 else
643 opts="${opts} -g ${egid}" 682 opts="${opts} -g ${egid}"
644 fi 683 fi
645 else 684 else
659 opts="${opts} ${eextra}" 698 opts="${opts} ${eextra}"
660 699
661 # add the group 700 # add the group
662 local oldsandbox="${SANDBOX_ON}" 701 local oldsandbox="${SANDBOX_ON}"
663 export SANDBOX_ON="0" 702 export SANDBOX_ON="0"
664 if [[ "${USERLAND}" == "Darwin" ]]; then 703 case ${CHOST} in
704 *-darwin*)
665 if [ ! -z "${eextra}" ]; 705 if [ ! -z "${eextra}" ];
666 then 706 then
667 einfo "Extra options are not supported on Darwin/OS X yet" 707 einfo "Extra options are not supported on Darwin/OS X yet"
668 einfo "Please report the ebuild along with the info below" 708 einfo "Please report the ebuild along with the info below"
669 einfo "eextra: ${eextra}" 709 einfo "eextra: ${eextra}"
670 die "Required function missing" 710 die "Required function missing"
671 fi 711 fi
672 712
673 # If we need the next available 713 # If we need the next available
674 case ${egid} in 714 case ${egid} in
675 *[!0-9]*) # Non numeric 715 *[!0-9]*) # Non numeric
676 for egid in $(seq 101 999); do 716 for egid in $(seq 101 999); do
677 [ -z "`egetent group ${egid}`" ] && break 717 [ -z "`egetent group ${egid}`" ] && break
678 done 718 done
679 esac 719 esac
680 dscl . create /groups/${egroup} gid ${egid} 720 dscl . create /groups/${egroup} gid ${egid}
681 dscl . create /groups/${egroup} passwd '*' 721 dscl . create /groups/${egroup} passwd '*'
682 elif [[ "${USERLAND}" == "BSD" ]] ; then 722 ;;
723
724 *-freebsd*|*-dragonfly*)
683 case ${egid} in 725 case ${egid} in
684 *[!0-9]*) # Non numeric 726 *[!0-9]*) # Non numeric
685 for egid in $(seq 101 999); do 727 for egid in $(seq 101 999); do
686 [ -z "`egetent group ${egid}`" ] && break 728 [ -z "`egetent group ${egid}`" ] && break
687 done 729 done
688 esac 730 esac
689 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 731 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
690 else 732 ;;
733
734 *-netbsd*)
735 case ${egid} in
736 *[!0-9]*) # Non numeric
737 for egid in $(seq 101 999); do
738 [ -z "`egetent group ${egid}`" ] && break
739 done
740 esac
741 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
742 ;;
743
744 *)
691 groupadd ${opts} ${egroup} || die "enewgroup failed" 745 groupadd ${opts} ${egroup} || die "enewgroup failed"
692 fi 746 ;;
747 esac
693 export SANDBOX_ON="${oldsandbox}" 748 export SANDBOX_ON="${oldsandbox}"
694} 749}
695 750
696# Simple script to replace 'dos2unix' binaries 751# Simple script to replace 'dos2unix' binaries
697# vapier@gentoo.org 752# vapier@gentoo.org
808 type="Network;${type}" 863 type="Network;${type}"
809 ;; 864 ;;
810 865
811 sci) 866 sci)
812 case ${catmin} in 867 case ${catmin} in
813 astro*) type=Astronomoy;; 868 astro*) type=Astronomy;;
814 bio*) type=Biology;; 869 bio*) type=Biology;;
815 calc*) type=Calculator;; 870 calc*) type=Calculator;;
816 chem*) type=Chemistry;; 871 chem*) type=Chemistry;;
817 geo*) type=Geology;; 872 geo*) type=Geology;;
818 math*) type=Math;; 873 math*) type=Math;;
850Exec=${exec} 905Exec=${exec}
851Path=${path} 906Path=${path}
852Icon=${icon} 907Icon=${icon}
853Categories=Application;${type};" > "${desktop}" 908Categories=Application;${type};" > "${desktop}"
854 909
910 (
911 # wrap the env here so that the 'insinto' call
912 # doesn't corrupt the env of the caller
855 insinto /usr/share/applications 913 insinto /usr/share/applications
856 doins "${desktop}" 914 doins "${desktop}"
857 915 )
858 return 0
859} 916}
860 917
861# Make a GDM/KDM Session file 918# Make a GDM/KDM Session file
862# 919#
863# make_desktop_entry(<title>, <command>) 920# make_desktop_entry(<title>, <command>)
968 local sizeoff_t=$2 1025 local sizeoff_t=$2
969 1026
970 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1027 [[ -z ${src} ]] && die "Could not locate source for '$1'"
971 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :(" 1028 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
972 1029
973 local shrtsrc="`basename ${src}`" 1030 local shrtsrc=$(basename "${src}")
974 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1031 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
975 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1032 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
976 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1033 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
977 1034
978 # grab metadata for debug reasons 1035 # grab metadata for debug reasons
1042# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1099# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1043# - If the file is not specified then unpack will utilize ${A}. 1100# - If the file is not specified then unpack will utilize ${A}.
1044# - If the offset is not specified then we will attempt to extract 1101# - If the offset is not specified then we will attempt to extract
1045# the proper offset from the script itself. 1102# the proper offset from the script itself.
1046unpack_makeself() { 1103unpack_makeself() {
1104 local src_input=${1:-${A}}
1047 local src=$(find_unpackable_file "$1") 1105 local src=$(find_unpackable_file "${src_input}")
1048 local skip=$2 1106 local skip=$2
1049 local exe=$3 1107 local exe=$3
1050 1108
1051 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1109 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1052 1110
1053 local shrtsrc=$(basename "${src}") 1111 local shrtsrc=$(basename "${src}")
1054 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1112 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1055 if [ -z "${skip}" ] 1113 if [[ -z ${skip} ]] ; then
1056 then
1057 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1114 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1058 local skip=0 1115 local skip=0
1059 exe=tail 1116 exe=tail
1060 case ${ver} in 1117 case ${ver} in
1061 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1118 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1062 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1119 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1074 ;; 1131 ;;
1075 2.1.3) 1132 2.1.3)
1076 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1133 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1077 let skip="skip + 1" 1134 let skip="skip + 1"
1078 ;; 1135 ;;
1079 2.1.4) 1136 2.1.4|2.1.5)
1080 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1137 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1081 skip=$(head -n ${skip} "${src}" | wc -c) 1138 skip=$(head -n ${skip} "${src}" | wc -c)
1082 exe="dd" 1139 exe="dd"
1083 ;; 1140 ;;
1084 *) 1141 *)
1129check_license() { 1186check_license() {
1130 local lic=$1 1187 local lic=$1
1131 if [ -z "${lic}" ] ; then 1188 if [ -z "${lic}" ] ; then
1132 lic="${PORTDIR}/licenses/${LICENSE}" 1189 lic="${PORTDIR}/licenses/${LICENSE}"
1133 else 1190 else
1134 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1191 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1135 lic="${PORTDIR}/licenses/${src}" 1192 lic="${PORTDIR}/licenses/${lic}"
1136 elif [ -e "${PWD}/${src}" ] ; then 1193 elif [ -e "${PWD}/${lic}" ] ; then
1137 lic="${PWD}/${src}" 1194 lic="${PWD}/${lic}"
1138 elif [ -e "${src}" ] ; then 1195 elif [ -e "${lic}" ] ; then
1139 lic="${src}" 1196 lic="${lic}"
1140 fi
1141 fi 1197 fi
1198 fi
1142 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1199 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1143 local l="`basename ${lic}`" 1200 local l="`basename ${lic}`"
1144 1201
1145 # here is where we check for the licenses the user already 1202 # here is where we check for the licenses the user already
1146 # accepted ... if we don't find a match, we make the user accept 1203 # accepted ... if we don't find a match, we make the user accept
1147 local shopts=$- 1204 local shopts=$-
1203 # first we figure out how many cds we're dealing with by 1260 # first we figure out how many cds we're dealing with by
1204 # the # of files they gave us 1261 # the # of files they gave us
1205 local cdcnt=0 1262 local cdcnt=0
1206 local f= 1263 local f=
1207 for f in "$@" ; do 1264 for f in "$@" ; do
1208 cdcnt=$((cdcnt + 1)) 1265 ((++cdcnt))
1209 export CDROM_CHECK_${cdcnt}="$f" 1266 export CDROM_CHECK_${cdcnt}="$f"
1210 done 1267 done
1211 export CDROM_TOTAL_CDS=${cdcnt} 1268 export CDROM_TOTAL_CDS=${cdcnt}
1212 export CDROM_CURRENT_CD=1 1269 export CDROM_CURRENT_CD=1
1213 1270
1214 # now we see if the user gave use CD_ROOT ... 1271 # now we see if the user gave use CD_ROOT ...
1215 # if they did, let's just believe them that it's correct 1272 # if they did, let's just believe them that it's correct
1216 if [[ ! -z ${CD_ROOT} ]] ; then
1217 export CDROM_ROOT=${CD_ROOT}
1218 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1219 return
1220 fi
1221 # do the same for CD_ROOT_X
1222 if [[ ! -z ${CD_ROOT_1} ]] ; then 1273 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1223 local var= 1274 local var=
1224 cdcnt=0 1275 cdcnt=0
1225 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1276 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1226 cdcnt=$((cdcnt + 1)) 1277 ((++cdcnt))
1227 var="CD_ROOT_${cdcnt}" 1278 var="CD_ROOT_${cdcnt}"
1279 [[ -z ${!var} ]] && var="CD_ROOT"
1228 if [[ -z ${!var} ]] ; then 1280 if [[ -z ${!var} ]] ; then
1229 eerror "You must either use just the CD_ROOT" 1281 eerror "You must either use just the CD_ROOT"
1230 eerror "or specify ALL the CD_ROOT_X variables." 1282 eerror "or specify ALL the CD_ROOT_X variables."
1231 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1283 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1232 die "could not locate CD_ROOT_${cdcnt}" 1284 die "could not locate CD_ROOT_${cdcnt}"
1233 fi 1285 fi
1234 export CDROM_ROOTS_${cdcnt}="${!var}"
1235 done 1286 done
1236 export CDROM_ROOT=${CDROM_ROOTS_1} 1287 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1237 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1288 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1289 export CDROM_SET=-1
1290 for f in ${CDROM_CHECK_1//:/ } ; do
1291 ((++CDROM_SET))
1292 [[ -e ${CD_ROOT}/${f} ]] && break
1293 done
1294 export CDROM_MATCH=${f}
1238 return 1295 return
1239 fi 1296 fi
1240 1297
1298 # User didn't help us out so lets make sure they know they can
1299 # simplify the whole process ...
1241 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1300 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1242 einfon "This ebuild will need the " 1301 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1243 if [[ -z ${CDROM_NAME} ]] ; then
1244 echo "cdrom for ${PN}."
1245 else
1246 echo "${CDROM_NAME}."
1247 fi
1248 echo 1302 echo
1249 einfo "If you do not have the CD, but have the data files" 1303 einfo "If you do not have the CD, but have the data files"
1250 einfo "mounted somewhere on your filesystem, just export" 1304 einfo "mounted somewhere on your filesystem, just export"
1251 einfo "the variable CD_ROOT so that it points to the" 1305 einfo "the variable CD_ROOT so that it points to the"
1252 einfo "directory containing the files." 1306 einfo "directory containing the files."
1256 echo 1310 echo
1257 else 1311 else
1258 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1312 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1259 cdcnt=0 1313 cdcnt=0
1260 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1314 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1261 cdcnt=$((cdcnt + 1)) 1315 ((++cdcnt))
1262 var="CDROM_NAME_${cdcnt}" 1316 var="CDROM_NAME_${cdcnt}"
1263 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1317 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1264 done 1318 done
1265 echo 1319 echo
1266 einfo "If you do not have the CDs, but have the data files" 1320 einfo "If you do not have the CDs, but have the data files"
1267 einfo "mounted somewhere on your filesystem, just export" 1321 einfo "mounted somewhere on your filesystem, just export"
1268 einfo "the following variables so they point to the right place:" 1322 einfo "the following variables so they point to the right place:"
1269 einfon "" 1323 einfon ""
1270 cdcnt=0 1324 cdcnt=0
1271 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1325 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1272 cdcnt=$((cdcnt + 1)) 1326 ((++cdcnt))
1273 echo -n " CD_ROOT_${cdcnt}" 1327 echo -n " CD_ROOT_${cdcnt}"
1274 done 1328 done
1275 echo 1329 echo
1276 einfo "Or, if you have all the files in the same place, or" 1330 einfo "Or, if you have all the files in the same place, or"
1277 einfo "you only have one cdrom, you can export CD_ROOT" 1331 einfo "you only have one cdrom, you can export CD_ROOT"
1280 echo 1334 echo
1281 einfo "For example:" 1335 einfo "For example:"
1282 einfo "export CD_ROOT_1=/mnt/cdrom" 1336 einfo "export CD_ROOT_1=/mnt/cdrom"
1283 echo 1337 echo
1284 fi 1338 fi
1339
1340 export CDROM_SET=""
1285 export CDROM_CURRENT_CD=0 1341 export CDROM_CURRENT_CD=0
1286 cdrom_load_next_cd 1342 cdrom_load_next_cd
1287} 1343}
1288 1344
1289# this is only used when you need access to more than one cd. 1345# this is only used when you need access to more than one cd.
1290# when you have finished using the first cd, just call this function. 1346# when you have finished using the first cd, just call this function.
1291# when it returns, CDROM_ROOT will be pointing to the second cd. 1347# when it returns, CDROM_ROOT will be pointing to the second cd.
1292# remember, you can only go forward in the cd chain, you can't go back. 1348# remember, you can only go forward in the cd chain, you can't go back.
1293cdrom_load_next_cd() { 1349cdrom_load_next_cd() {
1294 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1295 local var= 1350 local var
1296 1351 ((++CDROM_CURRENT_CD))
1297 if [[ ! -z ${CD_ROOT} ]] ; then
1298 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1299 return
1300 fi
1301 1352
1302 unset CDROM_ROOT 1353 unset CDROM_ROOT
1303 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1354 var=CD_ROOT_${CDROM_CURRENT_CD}
1355 [[ -z ${!var} ]] && var="CD_ROOT"
1304 if [[ -z ${!var} ]] ; then 1356 if [[ -z ${!var} ]] ; then
1305 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1357 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1306 cdrom_locate_file_on_cd ${!var} 1358 _cdrom_locate_file_on_cd ${!var}
1307 else 1359 else
1308 export CDROM_ROOT=${!var} 1360 export CDROM_ROOT=${!var}
1309 fi 1361 fi
1310 1362
1311 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1363 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1316# all it does is try to locate a give file on a cd ... if the cd isn't 1368# all it does is try to locate a give file on a cd ... if the cd isn't
1317# found, then a message asking for the user to insert the cdrom will be 1369# found, then a message asking for the user to insert the cdrom will be
1318# displayed and we'll hang out here until: 1370# displayed and we'll hang out here until:
1319# (1) the file is found on a mounted cdrom 1371# (1) the file is found on a mounted cdrom
1320# (2) the user hits CTRL+C 1372# (2) the user hits CTRL+C
1321cdrom_locate_file_on_cd() { 1373_cdrom_locate_file_on_cd() {
1374 local mline=""
1375 local showedmsg=0
1376
1322 while [[ -z ${CDROM_ROOT} ]] ; do 1377 while [[ -z ${CDROM_ROOT} ]] ; do
1323 local dir=$(dirname "$*") 1378 local i=0
1379 local -a cdset=(${*//:/ })
1380 if [[ -n ${CDROM_SET} ]] ; then
1381 cdset=(${cdset[${CDROM_SET}]})
1382 fi
1383
1384 while [[ -n ${cdset[${i}]} ]] ; do
1385 local dir=$(dirname ${cdset[${i}]})
1324 local file=$(basename "$*") 1386 local file=$(basename ${cdset[${i}]})
1325 local mline=""
1326 local showedmsg=0
1327 1387
1328 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1388 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1329 [[ -d ${mline}/${dir} ]] || continue 1389 [[ -d ${mline}/${dir} ]] || continue
1330 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1390 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1331 && export CDROM_ROOT=${mline} 1391 export CDROM_ROOT=${mline}
1392 export CDROM_SET=${i}
1393 export CDROM_MATCH=${cdset[${i}]}
1394 return
1395 fi
1396 done
1397
1398 ((++i))
1332 done 1399 done
1333 1400
1334 if [[ -z ${CDROM_ROOT} ]] ; then
1335 echo 1401 echo
1336 if [[ ${showedmsg} -eq 0 ]] ; then 1402 if [[ ${showedmsg} -eq 0 ]] ; then
1337 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1403 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1338 if [[ -z ${CDROM_NAME} ]] ; then 1404 if [[ -z ${CDROM_NAME} ]] ; then
1339 einfo "Please insert the cdrom for ${PN} now !" 1405 einfo "Please insert+mount the cdrom for ${PN} now !"
1340 else
1341 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1342 fi
1343 else 1406 else
1344 if [[ -z ${CDROM_NAME_1} ]] ; then
1345 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1346 else
1347 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1348 einfo "Please insert+mount the ${!var} cdrom now !" 1407 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1349 fi
1350 fi 1408 fi
1351 showedmsg=1 1409 else
1410 if [[ -z ${CDROM_NAME_1} ]] ; then
1411 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1412 else
1413 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1414 einfo "Please insert+mount the ${!var} cdrom now !"
1415 fi
1352 fi 1416 fi
1417 showedmsg=1
1418 fi
1353 einfo "Press return to scan for the cd again" 1419 einfo "Press return to scan for the cd again"
1354 einfo "or hit CTRL+C to abort the emerge." 1420 einfo "or hit CTRL+C to abort the emerge."
1355 echo 1421 echo
1356 einfo "If you are having trouble with the detection" 1422 einfo "If you are having trouble with the detection"
1357 einfo "of your CD, it is possible that you do not have" 1423 einfo "of your CD, it is possible that you do not have"
1358 einfo "Joliet support enabled in your kernel. Please" 1424 einfo "Joliet support enabled in your kernel. Please"
1359 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1425 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1360 read 1426 read || die "something is screwed with your system"
1361 fi
1362 done 1427 done
1363} 1428}
1364 1429
1365# Make sure that LINGUAS only contains languages that 1430# Make sure that LINGUAS only contains languages that
1366# a package can support 1431# a package can support
1376# directories and uses the union of the lists. 1441# directories and uses the union of the lists.
1377strip-linguas() { 1442strip-linguas() {
1378 local ls newls 1443 local ls newls
1379 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1444 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1380 local op=$1; shift 1445 local op=$1; shift
1381 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1446 ls=" $(find "$1" -name '*.po' -exec basename {} \;) "; shift
1382 local d f 1447 local d f
1383 for d in "$@" ; do 1448 for d in "$@" ; do
1384 if [[ ${op} == "-u" ]] ; then 1449 if [[ ${op} == "-u" ]] ; then
1385 newls=${ls} 1450 newls=${ls}
1386 else 1451 else
1387 newls="" 1452 newls=""
1388 fi 1453 fi
1389 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1454 for f in $(find "$d" -name '*.po' -exec basename {} \;) ; do
1390 if [[ ${op} == "-i" ]] ; then 1455 if [[ ${op} == "-i" ]] ; then
1391 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1456 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1392 else 1457 else
1393 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1458 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1394 fi 1459 fi
1450 1515
1451# Jeremy Huddleston <eradicator@gentoo.org>: 1516# Jeremy Huddleston <eradicator@gentoo.org>:
1452# preserve_old_lib /path/to/libblah.so.0 1517# preserve_old_lib /path/to/libblah.so.0
1453# preserve_old_lib_notify /path/to/libblah.so.0 1518# preserve_old_lib_notify /path/to/libblah.so.0
1454# 1519#
1455# These functions are useful when a lib in your package changes --soname. Such 1520# These functions are useful when a lib in your package changes --library. Such
1456# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1521# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1457# would break packages that link against it. Most people get around this 1522# would break packages that link against it. Most people get around this
1458# by using the portage SLOT mechanism, but that is not always a relevant 1523# by using the portage SLOT mechanism, but that is not always a relevant
1459# solution, so instead you can add the following to your ebuilds: 1524# solution, so instead you can add the following to your ebuilds:
1460# 1525#
1491 1556
1492 ewarn "An old version of an installed library was detected on your system." 1557 ewarn "An old version of an installed library was detected on your system."
1493 ewarn "In order to avoid breaking packages that link against it, this older version" 1558 ewarn "In order to avoid breaking packages that link against it, this older version"
1494 ewarn "is not being removed. In order to make full use of this newer version," 1559 ewarn "is not being removed. In order to make full use of this newer version,"
1495 ewarn "you will need to execute the following command:" 1560 ewarn "you will need to execute the following command:"
1496 ewarn " revdep-rebuild --soname ${SONAME}" 1561 ewarn " revdep-rebuild --library ${SONAME}"
1497 ewarn 1562 ewarn
1498 ewarn "After doing that, you can safely remove ${LIB}" 1563 ewarn "After doing that, you can safely remove ${LIB}"
1499 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild" 1564 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1500 fi 1565 fi
1501} 1566}
1514 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1579 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1515 1580
1516 local PKG=$(best_version $1) 1581 local PKG=$(best_version $1)
1517 shift 1582 shift
1518 1583
1519 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1584 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1585
1586 # if the USE file doesnt exist, assume the $PKG is either
1587 # injected or package.provided
1520 [[ ! -e ${USEFILE} ]] && return 1 1588 [[ ! -e ${USEFILE} ]] && return 0
1521 1589
1522 local USE_BUILT=$(<${USEFILE}) 1590 local USE_BUILT=$(<${USEFILE})
1523 while [[ $# -gt 0 ]] ; do 1591 while [[ $# -gt 0 ]] ; do
1524 if [[ ${opt} = "-o" ]] ; then 1592 if [[ ${opt} = "-o" ]] ; then
1525 has $1 ${USE_BUILT} && return 0 1593 has $1 ${USE_BUILT} && return 0
1577# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1645# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1578# $5 == path for wrapper 1646# $5 == path for wrapper
1579make_wrapper() { 1647make_wrapper() {
1580 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1648 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1581 local tmpwrapper=$(emktemp) 1649 local tmpwrapper=$(emktemp)
1650 # We don't want to quote ${bin} so that people can pass complex
1651 # things as $bin ... "./someprog --args"
1582 cat << EOF > "${tmpwrapper}" 1652 cat << EOF > "${tmpwrapper}"
1583#!/bin/sh 1653#!/bin/sh
1584cd "${chdir}" 1654cd "${chdir:-.}"
1655if [ -n "${libdir}" ] ; then
1656 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1585export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1657 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1658 else
1659 export LD_LIBRARY_PATH="${libdir}"
1660 fi
1661fi
1586exec ${bin} "\$@" 1662exec ${bin} "\$@"
1587EOF 1663EOF
1588 chmod go+rx "${tmpwrapper}" 1664 chmod go+rx "${tmpwrapper}"
1589 if [ -n "${5}" ] 1665 if [[ -n ${path} ]] ; then
1590 then
1591 exeinto ${5} 1666 exeinto "${path}"
1592 newexe "${tmpwrapper}" "${wrapper}" 1667 newexe "${tmpwrapper}" "${wrapper}"
1593 else 1668 else
1594 newbin "${tmpwrapper}" "${wrapper}" 1669 newbin "${tmpwrapper}" "${wrapper}"
1595 fi 1670 fi
1596} 1671}

Legend:
Removed from v.1.197  
changed lines
  Added in v.1.228

  ViewVC Help
Powered by ViewVC 1.1.20