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

Diff of /eclass/eutils.eclass

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

Revision 1.182 Revision 1.218
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.182 2005/06/11 00:02:26 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.218 2005/11/22 11:15:34 flameeyes 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.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib 12inherit multilib portability
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15 13
16DEPEND="!bootstrap? ( sys-devel/patch userland_GNU? ( sys-apps/shadow ) )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
17# sys-apps/shadow is needed for useradd, etc, bug #94745. 15# sys-apps/shadow is needed for useradd, etc, bug #94745.
18 16
19DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
20 18
21# Wait for the supplied number of seconds. If no argument is supplied, defaults 19# Wait for the supplied number of seconds. If no argument is supplied, defaults
69 dodir /usr/${libdir} 67 dodir /usr/${libdir}
70 68
71 for lib in "${@}" ; do 69 for lib in "${@}" ; do
72 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
73 /* GNU ld script 71 /* GNU ld script
74 Since Gentoo has critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
75 in /lib, and the static versions in /usr/lib, 73 in /lib, and the static versions in /usr/lib,
76 we need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
77 otherwise we run into linking problems. 75 otherwise we run into linking problems.
78 76
79 See bug http://bugs.gentoo.org/4411 for more info. 77 See bug http://bugs.gentoo.org/4411 for more info.
80 */ 78 */
81 GROUP ( /${libdir}/${lib} ) 79 GROUP ( /${libdir}/${lib} )
82 END_LDSCRIPT 80 END_LDSCRIPT
83 fperms a+x "/usr/${libdir}/${lib}" 81 fperms a+x "/usr/${libdir}/${lib}"
168# hand its a directory, it will set EPATCH_SOURCE to this. 166# hand its a directory, it will set EPATCH_SOURCE to this.
169# 167#
170# <azarah@gentoo.org> (10 Nov 2002) 168# <azarah@gentoo.org> (10 Nov 2002)
171# 169#
172epatch() { 170epatch() {
171 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
173 local PIPE_CMD="" 172 local PIPE_CMD=""
174 local STDERR_TARGET="${T}/$$.out" 173 local STDERR_TARGET="${T}/$$.out"
175 local PATCH_TARGET="${T}/$$.patch" 174 local PATCH_TARGET="${T}/$$.patch"
176 local PATCH_SUFFIX="" 175 local PATCH_SUFFIX=""
177 local SINGLE_PATCH="no" 176 local SINGLE_PATCH="no"
178 local x="" 177 local x=""
178
179 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
179 180
180 if [ "$#" -gt 1 ] 181 if [ "$#" -gt 1 ]
181 then 182 then
182 local m="" 183 local m=""
183 for m in "$@" ; do 184 for m in "$@" ; do
313 count=5 314 count=5
314 break 315 break
315 fi 316 fi
316 fi 317 fi
317 318
318 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 319 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
319 then 320 then
320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 321 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 323 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 324 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 325 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
325 326
326 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 327 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
328 _epatch_assert
327 329
328 if [ "$?" -ne 0 ] 330 if [ "$?" -ne 0 ]
329 then 331 then
330 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 332 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
331 echo 333 echo
377# vapier@gentoo.org 379# vapier@gentoo.org
378# 380#
379# Takes just 1 optional parameter (the directory to create tmpfile in) 381# Takes just 1 optional parameter (the directory to create tmpfile in)
380emktemp() { 382emktemp() {
381 local exe="touch" 383 local exe="touch"
382 [ "$1" == "-d" ] && exe="mkdir" && shift 384 [[ $1 == -d ]] && exe="mkdir" && shift
383 local topdir="$1" 385 local topdir=$1
384 386
385 if [ -z "${topdir}" ] 387 if [[ -z ${topdir} ]] ; then
386 then
387 [ -z "${T}" ] \ 388 [[ -z ${T} ]] \
388 && topdir="/tmp" \ 389 && topdir="/tmp" \
389 || topdir="${T}" 390 || topdir=${T}
390 fi 391 fi
391 392
392 if [ -z "$(type -p mktemp)" ] 393 if [[ -z $(type -p mktemp) ]] ; then
393 then
394 local tmp=/ 394 local tmp=/
395 while [ -e "${tmp}" ] ; do 395 while [[ -e ${tmp} ]] ; do
396 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 396 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
397 done 397 done
398 ${exe} "${tmp}" 398 ${exe} "${tmp}" || ${exe} -p "${tmp}"
399 echo "${tmp}" 399 echo "${tmp}"
400 else 400 else
401 [ "${exe}" == "touch" ] \ 401 [[ ${exe} == "touch" ]] \
402 && exe="-p" \ 402 && exe="-p" \
403 || exe="-d" 403 || exe="-d"
404 mktemp ${exe} "${topdir}" 404 mktemp ${exe} "${topdir}"
405 fi 405 fi
406} 406}
410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
412# 412#
413# egetent(database, key) 413# egetent(database, key)
414egetent() { 414egetent() {
415 if [[ "${USERLAND}" == "Darwin" ]] ; then 415 case ${CHOST} in
416 *-darwin*)
416 case "$2" in 417 case "$2" in
417 *[!0-9]*) # Non numeric 418 *[!0-9]*) # Non numeric
418 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
419 ;; 420 ;;
420 *) # Numeric 421 *) # Numeric
421 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 422 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
422 ;; 423 ;;
423 esac 424 esac
424 elif [[ "${USERLAND}" == "BSD" ]] ; then 425 ;;
425 local action 426 *-freebsd*)
426 if [ "$1" == "passwd" ] 427 local opts action="user"
427 then 428 [[ $1 == "passwd" ]] || action="group"
428 action="user" 429
429 else 430 # lookup by uid/gid
430 action="group" 431 if [[ $2 == [[:digit:]]* ]] ; then
432 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
431 fi 433 fi
434
432 pw show "${action}" "$2" -q 435 pw show ${action} ${opts} "$2" -q
433 else 436 ;;
437 *-netbsd*|*-openbsd*)
438 grep "$2:\*:" /etc/$1
439 ;;
440 *)
434 which nscd >& /dev/null && nscd -i "$1" 441 type -p nscd >& /dev/null && nscd -i "$1"
435 getent "$1" "$2" 442 getent "$1" "$2"
436 fi 443 ;;
444 esac
437} 445}
438 446
439# Simplify/standardize adding users to the system 447# Simplify/standardize adding users to the system
440# vapier@gentoo.org 448# vapier@gentoo.org
441# 449#
479 fi 487 fi
480 else 488 else
481 euid="next" 489 euid="next"
482 fi 490 fi
483 if [[ ${euid} == "next" ]] ; then 491 if [[ ${euid} == "next" ]] ; then
484 local pwrange 492 for euid in $(seq 101 999) ; do
485 if [[ ${USERLAND} == "BSD" ]] ; then
486 pwrange=$(jot 898 101)
487 else
488 pwrange=$(seq 101 999)
489 fi
490 for euid in ${pwrange} ; do
491 [[ -z $(egetent passwd ${euid}) ]] && break 493 [[ -z $(egetent passwd ${euid}) ]] && break
492 done 494 done
493 fi 495 fi
494 opts="${opts} -u ${euid}" 496 opts="${opts} -u ${euid}"
495 einfo " - Userid: ${euid}" 497 einfo " - Userid: ${euid}"
500 if [[ ! -e ${eshell} ]] ; then 502 if [[ ! -e ${eshell} ]] ; then
501 eerror "A shell was specified but it does not exist !" 503 eerror "A shell was specified but it does not exist !"
502 die "${eshell} does not exist" 504 die "${eshell} does not exist"
503 fi 505 fi
504 else 506 else
505 case ${USERLAND} in 507 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
506 Darwin) eshell="/usr/bin/false";; 508 [[ -x ${ROOT}${shell} ]] && break
507 BSD) eshell="/usr/sbin/nologin";; 509 done
508 *) eshell="/bin/false";; 510
509 esac 511 if [[ ${shell} == "/dev/null" ]] ; then
512 eerror "Unable to identify the shell to use"
513 die "Unable to identify the shell to use"
514 fi
515
516 eshell=${shell}
510 fi 517 fi
511 einfo " - Shell: ${eshell}" 518 einfo " - Shell: ${eshell}"
512 opts="${opts} -s ${eshell}" 519 opts="${opts} -s ${eshell}"
513 520
514 # handle homedir 521 # handle homedir
551 einfo " - Groups: ${egroups}" 558 einfo " - Groups: ${egroups}"
552 559
553 # handle extra and add the user 560 # handle extra and add the user
554 local oldsandbox=${SANDBOX_ON} 561 local oldsandbox=${SANDBOX_ON}
555 export SANDBOX_ON="0" 562 export SANDBOX_ON="0"
556 case ${USERLAND} in 563 case ${CHOST} in
557 Darwin) 564 *-darwin*)
558 ### Make the user 565 ### Make the user
559 if [[ -z $@ ]] ; then 566 if [[ -z $@ ]] ; then
560 dscl . create /users/${euser} uid ${euid} 567 dscl . create /users/${euser} uid ${euid}
561 dscl . create /users/${euser} shell ${eshell} 568 dscl . create /users/${euser} shell ${eshell}
562 dscl . create /users/${euser} home ${ehome} 569 dscl . create /users/${euser} home ${ehome}
573 einfo "Please report the ebuild along with the info below" 580 einfo "Please report the ebuild along with the info below"
574 einfo "eextra: $@" 581 einfo "eextra: $@"
575 die "Required function missing" 582 die "Required function missing"
576 fi 583 fi
577 ;; 584 ;;
578 BSD) 585 *-freebsd*)
579 if [[ -z $@ ]] ; then 586 if [[ -z $@ ]] ; then
580 pw useradd ${euser} ${opts} \ 587 pw useradd ${euser} ${opts} \
581 -c "added by portage for ${PN}" \ 588 -c "added by portage for ${PN}" \
582 die "enewuser failed" 589 die "enewuser failed"
583 else 590 else
584 einfo " - Extra: $@" 591 einfo " - Extra: $@"
585 pw useradd ${euser} ${opts} \ 592 pw useradd ${euser} ${opts} \
586 "$@" || die "enewuser failed" 593 "$@" || die "enewuser failed"
587 fi 594 fi
588 ;; 595 ;;
596
597 *-netbsd*)
598 if [[ -z $@ ]] ; then
599 useradd ${opts} ${euser} || die "enewuser failed"
600 else
601 einfo " - Extra: $@"
602 useradd ${opts} ${euser} "$@" || die "enewuser failed"
603 fi
604 ;;
605
606 *-openbsd*)
607 if [[ -z $@ ]] ; then
608 useradd -u ${euid} -s ${eshell} \
609 -d ${ehome} -c "Added by portage for ${PN}" \
610 -g ${egroups} ${euser} || die "enewuser failed"
611 else
612 einfo " - Extra: $@"
613 useradd -u ${euid} -s ${eshell} \
614 -d ${ehome} -c "Added by portage for ${PN}" \
615 -g ${egroups} ${euser} "$@" || die "enewuser failed"
616 fi
617 ;;
618
589 *) 619 *)
590 if [[ -z $@ ]] ; then 620 if [[ -z $@ ]] ; then
591 useradd ${opts} ${euser} \ 621 useradd ${opts} ${euser} \
592 -c "added by portage for ${PN}" \ 622 -c "added by portage for ${PN}" \
593 || die "enewuser failed" 623 || die "enewuser failed"
596 useradd ${opts} ${euser} "$@" \ 626 useradd ${opts} ${euser} "$@" \
597 || die "enewuser failed" 627 || die "enewuser failed"
598 fi 628 fi
599 ;; 629 ;;
600 esac 630 esac
631
632 if [[ ! -e ${ROOT}/${ehome} ]] ; then
633 einfo " - Creating ${ehome} in ${ROOT}"
634 mkdir -p "${ROOT}/${ehome}"
635 chown ${euser} "${ROOT}/${ehome}"
636 chmod 755 "${ROOT}/${ehome}"
637 fi
638
601 export SANDBOX_ON=${oldsandbox} 639 export SANDBOX_ON=${oldsandbox}
602
603 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
604 then
605 einfo " - Creating ${ehome} in ${D}"
606 dodir ${ehome}
607 fowners ${euser} ${ehome}
608 fperms 755 ${ehome}
609 fi
610} 640}
611 641
612# Simplify/standardize adding groups to the system 642# Simplify/standardize adding groups to the system
613# vapier@gentoo.org 643# vapier@gentoo.org
614# 644#
643 then 673 then
644 if [ "${egid}" -gt 0 ] 674 if [ "${egid}" -gt 0 ]
645 then 675 then
646 if [ -z "`egetent group ${egid}`" ] 676 if [ -z "`egetent group ${egid}`" ]
647 then 677 then
648 if [[ "${USERLAND}" == "Darwin" ]]; then 678 if [[ "${CHOST}" == *-darwin* ]]; then
649 opts="${opts} ${egid}" 679 opts="${opts} ${egid}"
650 else 680 else
651 opts="${opts} -g ${egid}" 681 opts="${opts} -g ${egid}"
652 fi 682 fi
653 else 683 else
667 opts="${opts} ${eextra}" 697 opts="${opts} ${eextra}"
668 698
669 # add the group 699 # add the group
670 local oldsandbox="${SANDBOX_ON}" 700 local oldsandbox="${SANDBOX_ON}"
671 export SANDBOX_ON="0" 701 export SANDBOX_ON="0"
672 if [[ "${USERLAND}" == "Darwin" ]]; then 702 case ${CHOST} in
703 *-darwin*)
673 if [ ! -z "${eextra}" ]; 704 if [ ! -z "${eextra}" ];
674 then 705 then
675 einfo "Extra options are not supported on Darwin/OS X yet" 706 einfo "Extra options are not supported on Darwin/OS X yet"
676 einfo "Please report the ebuild along with the info below" 707 einfo "Please report the ebuild along with the info below"
677 einfo "eextra: ${eextra}" 708 einfo "eextra: ${eextra}"
678 die "Required function missing" 709 die "Required function missing"
679 fi 710 fi
680 711
681 # If we need the next available 712 # If we need the next available
682 case ${egid} in 713 case ${egid} in
683 *[!0-9]*) # Non numeric 714 *[!0-9]*) # Non numeric
684 for egid in `jot 898 101`; do 715 for egid in $(seq 101 999); do
685 [ -z "`egetent group ${egid}`" ] && break 716 [ -z "`egetent group ${egid}`" ] && break
686 done 717 done
687 esac 718 esac
688 dscl . create /groups/${egroup} gid ${egid} 719 dscl . create /groups/${egroup} gid ${egid}
689 dscl . create /groups/${egroup} passwd '*' 720 dscl . create /groups/${egroup} passwd '*'
690 elif [[ "${USERLAND}" == "BSD" ]] ; then 721 ;;
722
723 *-freebsd*)
691 case ${egid} in 724 case ${egid} in
692 *[!0-9]*) # Non numeric 725 *[!0-9]*) # Non numeric
693 for egid in `jot 898 101`; do 726 for egid in $(seq 101 999); do
694 [ -z "`egetent group ${egid}`" ] && break 727 [ -z "`egetent group ${egid}`" ] && break
695 done 728 done
696 esac 729 esac
697 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 730 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
698 else 731 ;;
732
733 *-netbsd*)
734 case ${egid} in
735 *[!0-9]*) # Non numeric
736 for egid in $(seq 101 999); do
737 [ -z "`egetent group ${egid}`" ] && break
738 done
739 esac
740 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
741 ;;
742
743 *)
699 groupadd ${opts} ${egroup} || die "enewgroup failed" 744 groupadd ${opts} ${egroup} || die "enewgroup failed"
700 fi 745 ;;
746 esac
701 export SANDBOX_ON="${oldsandbox}" 747 export SANDBOX_ON="${oldsandbox}"
702} 748}
703 749
704# Simple script to replace 'dos2unix' binaries 750# Simple script to replace 'dos2unix' binaries
705# vapier@gentoo.org 751# vapier@gentoo.org
730# name: the name that will show up in the menu 776# name: the name that will show up in the menu
731# icon: give your little like a pretty little icon ... 777# icon: give your little like a pretty little icon ...
732# this can be relative (to /usr/share/pixmaps) or 778# this can be relative (to /usr/share/pixmaps) or
733# a full path to an icon 779# a full path to an icon
734# type: what kind of application is this ? for categories: 780# type: what kind of application is this ? for categories:
735# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 781# http://www.freedesktop.org/Standards/desktop-entry-spec
736# path: if your app needs to startup in a specific dir 782# path: if your app needs to startup in a specific dir
737make_desktop_entry() { 783make_desktop_entry() {
738 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 784 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
739 785
740 local exec=${1} 786 local exec=${1}
766 dev) 812 dev)
767 type="Development" 813 type="Development"
768 ;; 814 ;;
769 815
770 games) 816 games)
771 [[ -z ${path} ]] && path=${GAMES_BINDIR}
772
773 case ${catmin} in 817 case ${catmin} in
774 action) type=ActionGame;; 818 action) type=ActionGame;;
775 arcade) type=ArcadeGame;; 819 arcade) type=ArcadeGame;;
776 board) type=BoardGame;; 820 board) type=BoardGame;;
777 kid) type=KidsGame;; 821 kid) type=KidsGame;;
818 type="Network;${type}" 862 type="Network;${type}"
819 ;; 863 ;;
820 864
821 sci) 865 sci)
822 case ${catmin} in 866 case ${catmin} in
823 astro*) type=Astronomoy;; 867 astro*) type=Astronomy;;
824 bio*) type=Biology;; 868 bio*) type=Biology;;
825 calc*) type=Calculator;; 869 calc*) type=Calculator;;
826 chem*) type=Chemistry;; 870 chem*) type=Chemistry;;
827 geo*) type=Geology;; 871 geo*) type=Geology;;
828 math*) type=Math;; 872 math*) type=Math;;
860Exec=${exec} 904Exec=${exec}
861Path=${path} 905Path=${path}
862Icon=${icon} 906Icon=${icon}
863Categories=Application;${type};" > "${desktop}" 907Categories=Application;${type};" > "${desktop}"
864 908
909 (
910 # wrap the env here so that the 'insinto' call
911 # doesn't corrupt the env of the caller
865 insinto /usr/share/applications 912 insinto /usr/share/applications
866 doins "${desktop}" 913 doins "${desktop}"
867 914 )
868 return 0
869} 915}
870 916
871# Make a GDM/KDM Session file 917# Make a GDM/KDM Session file
872# 918#
873# make_desktop_entry(<title>, <command>) 919# make_desktop_entry(<title>, <command>)
902 doins "${i}" 948 doins "${i}"
903 elif [[ -d ${i} ]] ; then 949 elif [[ -d ${i} ]] ; then
904 for j in "${i}"/*.desktop ; do 950 for j in "${i}"/*.desktop ; do
905 doins "${j}" 951 doins "${j}"
906 done 952 done
907 fi 953 fi
908 done 954 done
909} 955}
910newmenu() { 956newmenu() {
911 insinto /usr/share/applications 957 insinto /usr/share/applications
912 newins "$1" "$2" 958 newins "$1" "$2"
920 doins "${i}" 966 doins "${i}"
921 elif [[ -d ${i} ]] ; then 967 elif [[ -d ${i} ]] ; then
922 for j in "${i}"/*.png ; do 968 for j in "${i}"/*.png ; do
923 doins "${j}" 969 doins "${j}"
924 done 970 done
925 fi 971 fi
926 done 972 done
927} 973}
928newicon() { 974newicon() {
929 insinto /usr/share/pixmaps 975 insinto /usr/share/pixmaps
930 newins "$1" "$2" 976 newins "$1" "$2"
935############################################################## 981##############################################################
936 982
937 983
938# for internal use only (unpack_pdv and unpack_makeself) 984# for internal use only (unpack_pdv and unpack_makeself)
939find_unpackable_file() { 985find_unpackable_file() {
940 local src="$1" 986 local src=$1
941 if [ -z "${src}" ] 987 if [[ -z ${src} ]] ; then
942 then
943 src="${DISTDIR}/${A}" 988 src=${DISTDIR}/${A}
944 else 989 else
945 if [ -e "${DISTDIR}/${src}" ] 990 if [[ -e ${DISTDIR}/${src} ]] ; then
946 then
947 src="${DISTDIR}/${src}" 991 src=${DISTDIR}/${src}
948 elif [ -e "${PWD}/${src}" ] 992 elif [[ -e ${PWD}/${src} ]] ; then
949 then
950 src="${PWD}/${src}" 993 src=${PWD}/${src}
951 elif [ -e "${src}" ] 994 elif [[ -e ${src} ]] ; then
952 then
953 src="${src}" 995 src=${src}
954 fi
955 fi 996 fi
956 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 997 fi
998 [[ ! -e ${src} ]] && return 1
957 echo "${src}" 999 echo "${src}"
958} 1000}
959 1001
960# Unpack those pesky pdv generated files ... 1002# Unpack those pesky pdv generated files ...
961# They're self-unpacking programs with the binary package stuffed in 1003# They're self-unpacking programs with the binary package stuffed in
976# lseek 1018# lseek
977# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1019# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
978# lseek(3, -4, SEEK_END) = 2981250 1020# lseek(3, -4, SEEK_END) = 2981250
979# thus we would pass in the value of '4' as the second parameter. 1021# thus we would pass in the value of '4' as the second parameter.
980unpack_pdv() { 1022unpack_pdv() {
981 local src="`find_unpackable_file $1`" 1023 local src=$(find_unpackable_file $1)
982 local sizeoff_t="$2" 1024 local sizeoff_t=$2
983 1025
1026 [[ -z ${src} ]] && die "Could not locate source for '$1'"
984 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1027 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
985 1028
986 local shrtsrc="`basename ${src}`" 1029 local shrtsrc=$(basename "${src}")
987 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1030 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
988 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1031 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
989 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1032 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
990 1033
991 # grab metadata for debug reasons 1034 # grab metadata for debug reasons
1055# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1098# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1056# - If the file is not specified then unpack will utilize ${A}. 1099# - If the file is not specified then unpack will utilize ${A}.
1057# - If the offset is not specified then we will attempt to extract 1100# - If the offset is not specified then we will attempt to extract
1058# the proper offset from the script itself. 1101# the proper offset from the script itself.
1059unpack_makeself() { 1102unpack_makeself() {
1103 local src_input=${1:-${A}}
1060 local src="$(find_unpackable_file "$1")" 1104 local src=$(find_unpackable_file "${src_input}")
1061 local skip="$2" 1105 local skip=$2
1062 local exe="$3" 1106 local exe=$3
1063 1107
1108 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1109
1064 local shrtsrc="$(basename "${src}")" 1110 local shrtsrc=$(basename "${src}")
1065 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1111 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1066 if [ -z "${skip}" ] 1112 if [[ -z ${skip} ]] ; then
1067 then
1068 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1113 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1069 local skip=0 1114 local skip=0
1070 exe=tail 1115 exe=tail
1071 case ${ver} in 1116 case ${ver} in
1072 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1117 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1073 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1118 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1085 ;; 1130 ;;
1086 2.1.3) 1131 2.1.3)
1087 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1132 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1088 let skip="skip + 1" 1133 let skip="skip + 1"
1089 ;; 1134 ;;
1090 2.1.4) 1135 2.1.4|2.1.5)
1091 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1136 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1092 skip=$(head -n ${skip} "${src}" | wc -c) 1137 skip=$(head -n ${skip} "${src}" | wc -c)
1093 exe="dd" 1138 exe="dd"
1094 ;; 1139 ;;
1095 *) 1140 *)
1140check_license() { 1185check_license() {
1141 local lic=$1 1186 local lic=$1
1142 if [ -z "${lic}" ] ; then 1187 if [ -z "${lic}" ] ; then
1143 lic="${PORTDIR}/licenses/${LICENSE}" 1188 lic="${PORTDIR}/licenses/${LICENSE}"
1144 else 1189 else
1145 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1190 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1146 lic="${PORTDIR}/licenses/${src}" 1191 lic="${PORTDIR}/licenses/${lic}"
1147 elif [ -e "${PWD}/${src}" ] ; then 1192 elif [ -e "${PWD}/${lic}" ] ; then
1148 lic="${PWD}/${src}" 1193 lic="${PWD}/${lic}"
1149 elif [ -e "${src}" ] ; then 1194 elif [ -e "${lic}" ] ; then
1150 lic="${src}" 1195 lic="${lic}"
1151 fi
1152 fi 1196 fi
1197 fi
1153 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1198 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1154 local l="`basename ${lic}`" 1199 local l="`basename ${lic}`"
1155 1200
1156 # here is where we check for the licenses the user already 1201 # here is where we check for the licenses the user already
1157 # accepted ... if we don't find a match, we make the user accept 1202 # accepted ... if we don't find a match, we make the user accept
1158 local shopts=$- 1203 local shopts=$-
1214 # first we figure out how many cds we're dealing with by 1259 # first we figure out how many cds we're dealing with by
1215 # the # of files they gave us 1260 # the # of files they gave us
1216 local cdcnt=0 1261 local cdcnt=0
1217 local f= 1262 local f=
1218 for f in "$@" ; do 1263 for f in "$@" ; do
1219 cdcnt=$((cdcnt + 1)) 1264 ((++cdcnt))
1220 export CDROM_CHECK_${cdcnt}="$f" 1265 export CDROM_CHECK_${cdcnt}="$f"
1221 done 1266 done
1222 export CDROM_TOTAL_CDS=${cdcnt} 1267 export CDROM_TOTAL_CDS=${cdcnt}
1223 export CDROM_CURRENT_CD=1 1268 export CDROM_CURRENT_CD=1
1224 1269
1225 # now we see if the user gave use CD_ROOT ... 1270 # now we see if the user gave use CD_ROOT ...
1226 # if they did, let's just believe them that it's correct 1271 # if they did, let's just believe them that it's correct
1227 if [[ ! -z ${CD_ROOT} ]] ; then
1228 export CDROM_ROOT=${CD_ROOT}
1229 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1230 return
1231 fi
1232 # do the same for CD_ROOT_X
1233 if [[ ! -z ${CD_ROOT_1} ]] ; then 1272 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1234 local var= 1273 local var=
1235 cdcnt=0 1274 cdcnt=0
1236 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1275 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1237 cdcnt=$((cdcnt + 1)) 1276 ((++cdcnt))
1238 var="CD_ROOT_${cdcnt}" 1277 var="CD_ROOT_${cdcnt}"
1278 [[ -z ${!var} ]] && var="CD_ROOT"
1239 if [[ -z ${!var} ]] ; then 1279 if [[ -z ${!var} ]] ; then
1240 eerror "You must either use just the CD_ROOT" 1280 eerror "You must either use just the CD_ROOT"
1241 eerror "or specify ALL the CD_ROOT_X variables." 1281 eerror "or specify ALL the CD_ROOT_X variables."
1242 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1282 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1243 die "could not locate CD_ROOT_${cdcnt}" 1283 die "could not locate CD_ROOT_${cdcnt}"
1244 fi 1284 fi
1245 export CDROM_ROOTS_${cdcnt}="${!var}"
1246 done 1285 done
1247 export CDROM_ROOT=${CDROM_ROOTS_1} 1286 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1248 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1287 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1288 export CDROM_SET=-1
1289 for f in ${CDROM_CHECK_1//:/ } ; do
1290 ((++CDROM_SET))
1291 [[ -e ${CD_ROOT}/${f} ]] && break
1292 done
1293 export CDROM_MATCH=${f}
1249 return 1294 return
1250 fi 1295 fi
1251 1296
1297 # User didn't help us out so lets make sure they know they can
1298 # simplify the whole process ...
1252 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1299 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1253 einfon "This ebuild will need the " 1300 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1254 if [[ -z ${CDROM_NAME} ]] ; then
1255 echo "cdrom for ${PN}."
1256 else
1257 echo "${CDROM_NAME}."
1258 fi
1259 echo 1301 echo
1260 einfo "If you do not have the CD, but have the data files" 1302 einfo "If you do not have the CD, but have the data files"
1261 einfo "mounted somewhere on your filesystem, just export" 1303 einfo "mounted somewhere on your filesystem, just export"
1262 einfo "the variable CD_ROOT so that it points to the" 1304 einfo "the variable CD_ROOT so that it points to the"
1263 einfo "directory containing the files." 1305 einfo "directory containing the files."
1267 echo 1309 echo
1268 else 1310 else
1269 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1311 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1270 cdcnt=0 1312 cdcnt=0
1271 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1313 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1272 cdcnt=$((cdcnt + 1)) 1314 ((++cdcnt))
1273 var="CDROM_NAME_${cdcnt}" 1315 var="CDROM_NAME_${cdcnt}"
1274 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1316 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1275 done 1317 done
1276 echo 1318 echo
1277 einfo "If you do not have the CDs, but have the data files" 1319 einfo "If you do not have the CDs, but have the data files"
1278 einfo "mounted somewhere on your filesystem, just export" 1320 einfo "mounted somewhere on your filesystem, just export"
1279 einfo "the following variables so they point to the right place:" 1321 einfo "the following variables so they point to the right place:"
1280 einfon "" 1322 einfon ""
1281 cdcnt=0 1323 cdcnt=0
1282 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1324 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1283 cdcnt=$((cdcnt + 1)) 1325 ((++cdcnt))
1284 echo -n " CD_ROOT_${cdcnt}" 1326 echo -n " CD_ROOT_${cdcnt}"
1285 done 1327 done
1286 echo 1328 echo
1287 einfo "Or, if you have all the files in the same place, or" 1329 einfo "Or, if you have all the files in the same place, or"
1288 einfo "you only have one cdrom, you can export CD_ROOT" 1330 einfo "you only have one cdrom, you can export CD_ROOT"
1291 echo 1333 echo
1292 einfo "For example:" 1334 einfo "For example:"
1293 einfo "export CD_ROOT_1=/mnt/cdrom" 1335 einfo "export CD_ROOT_1=/mnt/cdrom"
1294 echo 1336 echo
1295 fi 1337 fi
1338
1339 export CDROM_SET=""
1296 export CDROM_CURRENT_CD=0 1340 export CDROM_CURRENT_CD=0
1297 cdrom_load_next_cd 1341 cdrom_load_next_cd
1298} 1342}
1299 1343
1300# this is only used when you need access to more than one cd. 1344# this is only used when you need access to more than one cd.
1301# when you have finished using the first cd, just call this function. 1345# when you have finished using the first cd, just call this function.
1302# when it returns, CDROM_ROOT will be pointing to the second cd. 1346# when it returns, CDROM_ROOT will be pointing to the second cd.
1303# remember, you can only go forward in the cd chain, you can't go back. 1347# remember, you can only go forward in the cd chain, you can't go back.
1304cdrom_load_next_cd() { 1348cdrom_load_next_cd() {
1305 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1306 local var= 1349 local var
1307 1350 ((++CDROM_CURRENT_CD))
1308 if [[ ! -z ${CD_ROOT} ]] ; then
1309 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1310 return
1311 fi
1312 1351
1313 unset CDROM_ROOT 1352 unset CDROM_ROOT
1314 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1353 var=CD_ROOT_${CDROM_CURRENT_CD}
1354 [[ -z ${!var} ]] && var="CD_ROOT"
1315 if [[ -z ${!var} ]] ; then 1355 if [[ -z ${!var} ]] ; then
1316 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1356 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1317 cdrom_locate_file_on_cd ${!var} 1357 _cdrom_locate_file_on_cd ${!var}
1318 else 1358 else
1319 export CDROM_ROOT=${!var} 1359 export CDROM_ROOT=${!var}
1320 fi 1360 fi
1321 1361
1322 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1362 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1327# all it does is try to locate a give file on a cd ... if the cd isn't 1367# all it does is try to locate a give file on a cd ... if the cd isn't
1328# found, then a message asking for the user to insert the cdrom will be 1368# found, then a message asking for the user to insert the cdrom will be
1329# displayed and we'll hang out here until: 1369# displayed and we'll hang out here until:
1330# (1) the file is found on a mounted cdrom 1370# (1) the file is found on a mounted cdrom
1331# (2) the user hits CTRL+C 1371# (2) the user hits CTRL+C
1332cdrom_locate_file_on_cd() { 1372_cdrom_locate_file_on_cd() {
1373 local mline=""
1374 local showedmsg=0
1375
1333 while [[ -z ${CDROM_ROOT} ]] ; do 1376 while [[ -z ${CDROM_ROOT} ]] ; do
1377 local i=0
1378 local -a cdset=(${*//:/ })
1379 if [[ -n ${CDROM_SET} ]] ; then
1380 cdset=(${cdset[${CDROM_SET}]})
1381 fi
1382
1383 while [[ -n ${cdset[${i}]} ]] ; do
1334 local dir="$(dirname ${@})" 1384 local dir=$(dirname ${cdset[${i}]})
1335 local file="$(basename ${@})" 1385 local file=$(basename ${cdset[${i}]})
1336 local mline=""
1337 local showedmsg=0
1338 1386
1339 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1387 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1340 [[ -d ${mline}/${dir} ]] || continue 1388 [[ -d ${mline}/${dir} ]] || continue
1341 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1389 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1342 && export CDROM_ROOT=${mline} 1390 export CDROM_ROOT=${mline}
1391 export CDROM_SET=${i}
1392 export CDROM_MATCH=${cdset[${i}]}
1393 return
1394 fi
1395 done
1396
1397 ((++i))
1343 done 1398 done
1344 1399
1345 if [[ -z ${CDROM_ROOT} ]] ; then
1346 echo 1400 echo
1347 if [[ ${showedmsg} -eq 0 ]] ; then 1401 if [[ ${showedmsg} -eq 0 ]] ; then
1348 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1402 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1349 if [[ -z ${CDROM_NAME} ]] ; then 1403 if [[ -z ${CDROM_NAME} ]] ; then
1350 einfo "Please insert the cdrom for ${PN} now !" 1404 einfo "Please insert+mount the cdrom for ${PN} now !"
1351 else
1352 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1353 fi
1354 else 1405 else
1355 if [[ -z ${CDROM_NAME_1} ]] ; then
1356 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1357 else
1358 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1359 einfo "Please insert+mount the ${!var} cdrom now !" 1406 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1360 fi
1361 fi 1407 fi
1362 showedmsg=1 1408 else
1409 if [[ -z ${CDROM_NAME_1} ]] ; then
1410 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1411 else
1412 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1413 einfo "Please insert+mount the ${!var} cdrom now !"
1414 fi
1363 fi 1415 fi
1416 showedmsg=1
1417 fi
1364 einfo "Press return to scan for the cd again" 1418 einfo "Press return to scan for the cd again"
1365 einfo "or hit CTRL+C to abort the emerge." 1419 einfo "or hit CTRL+C to abort the emerge."
1420 echo
1421 einfo "If you are having trouble with the detection"
1422 einfo "of your CD, it is possible that you do not have"
1423 einfo "Joliet support enabled in your kernel. Please"
1424 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1366 read 1425 read
1367 fi
1368 done 1426 done
1369} 1427}
1370 1428
1371# Make sure that LINGUAS only contains languages that 1429# Make sure that LINGUAS only contains languages that
1372# a package can support 1430# a package can support
1493 LIB=$1 1551 LIB=$1
1494 1552
1495 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1553 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1496 SONAME=`basename ${LIB}` 1554 SONAME=`basename ${LIB}`
1497 1555
1498 einfo "An old version of an installed library was detected on your system." 1556 ewarn "An old version of an installed library was detected on your system."
1499 einfo "In order to avoid breaking packages that link against is, this older version" 1557 ewarn "In order to avoid breaking packages that link against it, this older version"
1500 einfo "is not being removed. In order to make full use of this newer version," 1558 ewarn "is not being removed. In order to make full use of this newer version,"
1501 einfo "you will need to execute the following command:" 1559 ewarn "you will need to execute the following command:"
1502 einfo " revdep-rebuild --soname ${SONAME}" 1560 ewarn " revdep-rebuild --soname ${SONAME}"
1503 einfo 1561 ewarn
1504 einfo "After doing that, you can safely remove ${LIB}" 1562 ewarn "After doing that, you can safely remove ${LIB}"
1505 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1563 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1506 fi 1564 fi
1507} 1565}
1508 1566
1509# Hack for people to figure out if a package was built with 1567# Hack for people to figure out if a package was built with
1510# certain USE flags 1568# certain USE flags
1520 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1578 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1521 1579
1522 local PKG=$(best_version $1) 1580 local PKG=$(best_version $1)
1523 shift 1581 shift
1524 1582
1525 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1583 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1584
1585 # if the USE file doesnt exist, assume the $PKG is either
1586 # injected or package.provided
1526 [[ ! -e ${USEFILE} ]] && return 1 1587 [[ ! -e ${USEFILE} ]] && return 0
1527 1588
1528 local USE_BUILT=$(<${USEFILE}) 1589 local USE_BUILT=$(<${USEFILE})
1529 while [[ $# -gt 0 ]] ; do 1590 while [[ $# -gt 0 ]] ; do
1530 if [[ ${opt} = "-o" ]] ; then 1591 if [[ ${opt} = "-o" ]] ; then
1531 has $1 ${USE_BUILT} && return 0 1592 has $1 ${USE_BUILT} && return 0
1583# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1644# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1584# $5 == path for wrapper 1645# $5 == path for wrapper
1585make_wrapper() { 1646make_wrapper() {
1586 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1647 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1587 local tmpwrapper=$(emktemp) 1648 local tmpwrapper=$(emktemp)
1649 # We don't want to quote ${bin} so that people can pass complex
1650 # things as $bin ... "./someprog --args"
1588 cat << EOF > "${tmpwrapper}" 1651 cat << EOF > "${tmpwrapper}"
1589#!/bin/sh 1652#!/bin/sh
1590cd "${chdir}" 1653cd "${chdir:-.}"
1654if [ -n "${libdir}" ] ; then
1655 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1591export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1656 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1657 else
1658 export LD_LIBRARY_PATH="${libdir}"
1659 fi
1660fi
1592exec ${bin} "\$@" 1661exec ${bin} "\$@"
1593EOF 1662EOF
1594 chmod go+rx "${tmpwrapper}" 1663 chmod go+rx "${tmpwrapper}"
1595 if [ -n "${5}" ] 1664 if [[ -n ${path} ]] ; then
1596 then
1597 exeinto ${5} 1665 exeinto "${path}"
1598 newexe "${tmpwrapper}" "${wrapper}" 1666 newexe "${tmpwrapper}" "${wrapper}"
1599 else 1667 else
1600 newbin "${tmpwrapper}" "${wrapper}" 1668 newbin "${tmpwrapper}" "${wrapper}"
1601 fi 1669 fi
1602} 1670}

Legend:
Removed from v.1.182  
changed lines
  Added in v.1.218

  ViewVC Help
Powered by ViewVC 1.1.20