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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20