/[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.203
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.203 2005/09/27 12:38:56 ka0ttic 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}"
… …
174 local STDERR_TARGET="${T}/$$.out" 172 local STDERR_TARGET="${T}/$$.out"
175 local PATCH_TARGET="${T}/$$.patch" 173 local PATCH_TARGET="${T}/$$.patch"
176 local PATCH_SUFFIX="" 174 local PATCH_SUFFIX=""
177 local SINGLE_PATCH="no" 175 local SINGLE_PATCH="no"
178 local x="" 176 local x=""
177
178 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
179 179
180 if [ "$#" -gt 1 ] 180 if [ "$#" -gt 1 ]
181 then 181 then
182 local m="" 182 local m=""
183 for m in "$@" ; do 183 for m in "$@" ; do
… …
377# vapier@gentoo.org 377# vapier@gentoo.org
378# 378#
379# Takes just 1 optional parameter (the directory to create tmpfile in) 379# Takes just 1 optional parameter (the directory to create tmpfile in)
380emktemp() { 380emktemp() {
381 local exe="touch" 381 local exe="touch"
382 [ "$1" == "-d" ] && exe="mkdir" && shift 382 [[ $1 == -d ]] && exe="mkdir" && shift
383 local topdir="$1" 383 local topdir=$1
384 384
385 if [ -z "${topdir}" ] 385 if [[ -z ${topdir} ]] ; then
386 then
387 [ -z "${T}" ] \ 386 [[ -z ${T} ]] \
388 && topdir="/tmp" \ 387 && topdir="/tmp" \
389 || topdir="${T}" 388 || topdir=${T}
390 fi 389 fi
391 390
392 if [ -z "$(type -p mktemp)" ] 391 if [[ -z $(type -p mktemp) ]] ; then
393 then
394 local tmp=/ 392 local tmp=/
395 while [ -e "${tmp}" ] ; do 393 while [[ -e ${tmp} ]] ; do
396 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
397 done 395 done
398 ${exe} "${tmp}" 396 ${exe} "${tmp}" || ${exe} -p "${tmp}"
399 echo "${tmp}" 397 echo "${tmp}"
400 else 398 else
401 [ "${exe}" == "touch" ] \ 399 [[ ${exe} == "touch" ]] \
402 && exe="-p" \ 400 && exe="-p" \
403 || exe="-d" 401 || exe="-d"
404 mktemp ${exe} "${topdir}" 402 mktemp ${exe} "${topdir}"
405 fi 403 fi
406} 404}
… …
420 *) # Numeric 418 *) # Numeric
421 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
422 ;; 420 ;;
423 esac 421 esac
424 elif [[ "${USERLAND}" == "BSD" ]] ; then 422 elif [[ "${USERLAND}" == "BSD" ]] ; then
425 local action 423 local opts action="user"
426 if [ "$1" == "passwd" ] 424 [[ $1 == "passwd" ]] || action="group"
427 then 425
428 action="user" 426 # lookup by uid/gid
429 else 427 if [[ $2 == [[:digit:]]* ]] ; then
430 action="group" 428 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
431 fi 429 fi
430
432 pw show "${action}" "$2" -q 431 pw show ${action} ${opts} "$2" -q
433 else 432 else
434 which nscd >& /dev/null && nscd -i "$1" 433 which nscd >& /dev/null && nscd -i "$1"
435 getent "$1" "$2" 434 getent "$1" "$2"
436 fi 435 fi
437} 436}
… …
479 fi 478 fi
480 else 479 else
481 euid="next" 480 euid="next"
482 fi 481 fi
483 if [[ ${euid} == "next" ]] ; then 482 if [[ ${euid} == "next" ]] ; then
484 local pwrange 483 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 484 [[ -z $(egetent passwd ${euid}) ]] && break
492 done 485 done
493 fi 486 fi
494 opts="${opts} -u ${euid}" 487 opts="${opts} -u ${euid}"
495 einfo " - Userid: ${euid}" 488 einfo " - Userid: ${euid}"
… …
500 if [[ ! -e ${eshell} ]] ; then 493 if [[ ! -e ${eshell} ]] ; then
501 eerror "A shell was specified but it does not exist !" 494 eerror "A shell was specified but it does not exist !"
502 die "${eshell} does not exist" 495 die "${eshell} does not exist"
503 fi 496 fi
504 else 497 else
505 case ${USERLAND} in 498 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null; do
506 Darwin) eshell="/usr/bin/false";; 499 [[ -x ${ROOT}${shell} ]] && break;
507 BSD) eshell="/usr/sbin/nologin";; 500 done
508 *) eshell="/bin/false";; 501
509 esac 502 if [[ ${shell} == "/dev/null" ]]; then
503 eerror "Unable to identify the shell to use"
504 die "Unable to identify the shell to use"
505 fi
506
507 eshell=${shell}
510 fi 508 fi
511 einfo " - Shell: ${eshell}" 509 einfo " - Shell: ${eshell}"
512 opts="${opts} -s ${eshell}" 510 opts="${opts} -s ${eshell}"
513 511
514 # handle homedir 512 # handle homedir
… …
596 useradd ${opts} ${euser} "$@" \ 594 useradd ${opts} ${euser} "$@" \
597 || die "enewuser failed" 595 || die "enewuser failed"
598 fi 596 fi
599 ;; 597 ;;
600 esac 598 esac
599
600 if [[ ! -e ${ROOT}/${ehome} ]] ; then
601 einfo " - Creating ${ehome} in ${ROOT}"
602 mkdir -p "${ROOT}/${ehome}"
603 chown ${euser} "${ROOT}/${ehome}"
604 chmod 755 "${ROOT}/${ehome}"
605 fi
606
601 export SANDBOX_ON=${oldsandbox} 607 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} 608}
611 609
612# Simplify/standardize adding groups to the system 610# Simplify/standardize adding groups to the system
613# vapier@gentoo.org 611# vapier@gentoo.org
614# 612#
… …
679 fi 677 fi
680 678
681 # If we need the next available 679 # If we need the next available
682 case ${egid} in 680 case ${egid} in
683 *[!0-9]*) # Non numeric 681 *[!0-9]*) # Non numeric
684 for egid in `jot 898 101`; do 682 for egid in $(seq 101 999); do
685 [ -z "`egetent group ${egid}`" ] && break 683 [ -z "`egetent group ${egid}`" ] && break
686 done 684 done
687 esac 685 esac
688 dscl . create /groups/${egroup} gid ${egid} 686 dscl . create /groups/${egroup} gid ${egid}
689 dscl . create /groups/${egroup} passwd '*' 687 dscl . create /groups/${egroup} passwd '*'
690 elif [[ "${USERLAND}" == "BSD" ]] ; then 688 elif [[ "${USERLAND}" == "BSD" ]] ; then
691 case ${egid} in 689 case ${egid} in
692 *[!0-9]*) # Non numeric 690 *[!0-9]*) # Non numeric
693 for egid in `jot 898 101`; do 691 for egid in $(seq 101 999); do
694 [ -z "`egetent group ${egid}`" ] && break 692 [ -z "`egetent group ${egid}`" ] && break
695 done 693 done
696 esac 694 esac
697 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 695 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
698 else 696 else
… …
730# name: the name that will show up in the menu 728# name: the name that will show up in the menu
731# icon: give your little like a pretty little icon ... 729# icon: give your little like a pretty little icon ...
732# this can be relative (to /usr/share/pixmaps) or 730# this can be relative (to /usr/share/pixmaps) or
733# a full path to an icon 731# a full path to an icon
734# type: what kind of application is this ? for categories: 732# type: what kind of application is this ? for categories:
735# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 733# http://www.freedesktop.org/Standards/desktop-entry-spec
736# path: if your app needs to startup in a specific dir 734# path: if your app needs to startup in a specific dir
737make_desktop_entry() { 735make_desktop_entry() {
738 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 736 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
739 737
740 local exec=${1} 738 local exec=${1}
… …
766 dev) 764 dev)
767 type="Development" 765 type="Development"
768 ;; 766 ;;
769 767
770 games) 768 games)
771 [[ -z ${path} ]] && path=${GAMES_BINDIR}
772
773 case ${catmin} in 769 case ${catmin} in
774 action) type=ActionGame;; 770 action) type=ActionGame;;
775 arcade) type=ArcadeGame;; 771 arcade) type=ArcadeGame;;
776 board) type=BoardGame;; 772 board) type=BoardGame;;
777 kid) type=KidsGame;; 773 kid) type=KidsGame;;
… …
902 doins "${i}" 898 doins "${i}"
903 elif [[ -d ${i} ]] ; then 899 elif [[ -d ${i} ]] ; then
904 for j in "${i}"/*.desktop ; do 900 for j in "${i}"/*.desktop ; do
905 doins "${j}" 901 doins "${j}"
906 done 902 done
907 fi 903 fi
908 done 904 done
909} 905}
910newmenu() { 906newmenu() {
911 insinto /usr/share/applications 907 insinto /usr/share/applications
912 newins "$1" "$2" 908 newins "$1" "$2"
… …
920 doins "${i}" 916 doins "${i}"
921 elif [[ -d ${i} ]] ; then 917 elif [[ -d ${i} ]] ; then
922 for j in "${i}"/*.png ; do 918 for j in "${i}"/*.png ; do
923 doins "${j}" 919 doins "${j}"
924 done 920 done
925 fi 921 fi
926 done 922 done
927} 923}
928newicon() { 924newicon() {
929 insinto /usr/share/pixmaps 925 insinto /usr/share/pixmaps
930 newins "$1" "$2" 926 newins "$1" "$2"
… …
935############################################################## 931##############################################################
936 932
937 933
938# for internal use only (unpack_pdv and unpack_makeself) 934# for internal use only (unpack_pdv and unpack_makeself)
939find_unpackable_file() { 935find_unpackable_file() {
940 local src="$1" 936 local src=$1
941 if [ -z "${src}" ] 937 if [[ -z ${src} ]] ; then
942 then
943 src="${DISTDIR}/${A}" 938 src=${DISTDIR}/${A}
944 else 939 else
945 if [ -e "${DISTDIR}/${src}" ] 940 if [[ -e ${DISTDIR}/${src} ]] ; then
946 then
947 src="${DISTDIR}/${src}" 941 src=${DISTDIR}/${src}
948 elif [ -e "${PWD}/${src}" ] 942 elif [[ -e ${PWD}/${src} ]] ; then
949 then
950 src="${PWD}/${src}" 943 src=${PWD}/${src}
951 elif [ -e "${src}" ] 944 elif [[ -e ${src} ]] ; then
952 then
953 src="${src}" 945 src=${src}
954 fi
955 fi 946 fi
956 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 947 fi
948 [[ ! -e ${src} ]] && return 1
957 echo "${src}" 949 echo "${src}"
958} 950}
959 951
960# Unpack those pesky pdv generated files ... 952# Unpack those pesky pdv generated files ...
961# They're self-unpacking programs with the binary package stuffed in 953# They're self-unpacking programs with the binary package stuffed in
… …
976# lseek 968# lseek
977# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 969# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
978# lseek(3, -4, SEEK_END) = 2981250 970# lseek(3, -4, SEEK_END) = 2981250
979# thus we would pass in the value of '4' as the second parameter. 971# thus we would pass in the value of '4' as the second parameter.
980unpack_pdv() { 972unpack_pdv() {
981 local src="`find_unpackable_file $1`" 973 local src=$(find_unpackable_file $1)
982 local sizeoff_t="$2" 974 local sizeoff_t=$2
983 975
976 [[ -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 :(" 977 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
985 978
986 local shrtsrc="`basename ${src}`" 979 local shrtsrc="`basename ${src}`"
987 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 980 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
988 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 981 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\"` 982 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
… …
1055# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1048# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1056# - If the file is not specified then unpack will utilize ${A}. 1049# - If the file is not specified then unpack will utilize ${A}.
1057# - If the offset is not specified then we will attempt to extract 1050# - If the offset is not specified then we will attempt to extract
1058# the proper offset from the script itself. 1051# the proper offset from the script itself.
1059unpack_makeself() { 1052unpack_makeself() {
1060 local src="$(find_unpackable_file "$1")" 1053 local src=$(find_unpackable_file "$1")
1061 local skip="$2" 1054 local skip=$2
1062 local exe="$3" 1055 local exe=$3
1063 1056
1057 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1058
1064 local shrtsrc="$(basename "${src}")" 1059 local shrtsrc=$(basename "${src}")
1065 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1060 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1066 if [ -z "${skip}" ] 1061 if [ -z "${skip}" ]
1067 then 1062 then
1068 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1063 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1069 local skip=0 1064 local skip=0
… …
1140check_license() { 1135check_license() {
1141 local lic=$1 1136 local lic=$1
1142 if [ -z "${lic}" ] ; then 1137 if [ -z "${lic}" ] ; then
1143 lic="${PORTDIR}/licenses/${LICENSE}" 1138 lic="${PORTDIR}/licenses/${LICENSE}"
1144 else 1139 else
1145 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1140 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1146 lic="${PORTDIR}/licenses/${src}" 1141 lic="${PORTDIR}/licenses/${lic}"
1147 elif [ -e "${PWD}/${src}" ] ; then 1142 elif [ -e "${PWD}/${lic}" ] ; then
1148 lic="${PWD}/${src}" 1143 lic="${PWD}/${lic}"
1149 elif [ -e "${src}" ] ; then 1144 elif [ -e "${lic}" ] ; then
1150 lic="${src}" 1145 lic="${lic}"
1151 fi
1152 fi 1146 fi
1147 fi
1153 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1148 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1154 local l="`basename ${lic}`" 1149 local l="`basename ${lic}`"
1155 1150
1156 # here is where we check for the licenses the user already 1151 # 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 1152 # accepted ... if we don't find a match, we make the user accept
1158 local shopts=$- 1153 local shopts=$-
… …
1329# displayed and we'll hang out here until: 1324# displayed and we'll hang out here until:
1330# (1) the file is found on a mounted cdrom 1325# (1) the file is found on a mounted cdrom
1331# (2) the user hits CTRL+C 1326# (2) the user hits CTRL+C
1332cdrom_locate_file_on_cd() { 1327cdrom_locate_file_on_cd() {
1333 while [[ -z ${CDROM_ROOT} ]] ; do 1328 while [[ -z ${CDROM_ROOT} ]] ; do
1334 local dir="$(dirname ${@})" 1329 local dir=$(dirname "$*")
1335 local file="$(basename ${@})" 1330 local file=$(basename "$*")
1336 local mline="" 1331 local mline=""
1337 local showedmsg=0 1332 local showedmsg=0
1338 1333
1339 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1334 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1340 [[ -d ${mline}/${dir} ]] || continue 1335 [[ -d ${mline}/${dir} ]] || continue
… …
1361 fi 1356 fi
1362 showedmsg=1 1357 showedmsg=1
1363 fi 1358 fi
1364 einfo "Press return to scan for the cd again" 1359 einfo "Press return to scan for the cd again"
1365 einfo "or hit CTRL+C to abort the emerge." 1360 einfo "or hit CTRL+C to abort the emerge."
1361 echo
1362 einfo "If you are having trouble with the detection"
1363 einfo "of your CD, it is possible that you do not have"
1364 einfo "Joliet support enabled in your kernel. Please"
1365 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1366 read 1366 read
1367 fi 1367 fi
1368 done 1368 done
1369} 1369}
1370 1370
… …
1493 LIB=$1 1493 LIB=$1
1494 1494
1495 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1495 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1496 SONAME=`basename ${LIB}` 1496 SONAME=`basename ${LIB}`
1497 1497
1498 einfo "An old version of an installed library was detected on your system." 1498 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" 1499 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," 1500 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:" 1501 ewarn "you will need to execute the following command:"
1502 einfo " revdep-rebuild --soname ${SONAME}" 1502 ewarn " revdep-rebuild --soname ${SONAME}"
1503 einfo 1503 ewarn
1504 einfo "After doing that, you can safely remove ${LIB}" 1504 ewarn "After doing that, you can safely remove ${LIB}"
1505 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1505 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1506 fi 1506 fi
1507} 1507}
1508 1508
1509# Hack for people to figure out if a package was built with 1509# Hack for people to figure out if a package was built with
1510# certain USE flags 1510# certain USE flags
… …
1583# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1583# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1584# $5 == path for wrapper 1584# $5 == path for wrapper
1585make_wrapper() { 1585make_wrapper() {
1586 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1586 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1587 local tmpwrapper=$(emktemp) 1587 local tmpwrapper=$(emktemp)
1588 # We don't want to quote ${bin} so that people can pass complex
1589 # things as $bin ... "./someprog --args"
1588 cat << EOF > "${tmpwrapper}" 1590 cat << EOF > "${tmpwrapper}"
1589#!/bin/sh 1591#!/bin/sh
1590cd "${chdir}" 1592cd "${chdir:-.}"
1593if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then
1591export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1594 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1595fi
1592exec ${bin} "\$@" 1596exec ${bin} "\$@"
1593EOF 1597EOF
1594 chmod go+rx "${tmpwrapper}" 1598 chmod go+rx "${tmpwrapper}"
1595 if [ -n "${5}" ] 1599 if [[ -n ${path} ]] ; then
1596 then
1597 exeinto ${5} 1600 exeinto "${path}"
1598 newexe "${tmpwrapper}" "${wrapper}" 1601 newexe "${tmpwrapper}" "${wrapper}"
1599 else 1602 else
1600 newbin "${tmpwrapper}" "${wrapper}" 1603 newbin "${tmpwrapper}" "${wrapper}"
1601 fi 1604 fi
1602} 1605}
Legend:
Removed from v.1.182  
changed lines
  Added in v.1.203
  ViewVC Help
Powered by ViewVC 1.1.13