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

Diff of /eclass/eutils.eclass

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

Revision 1.256 Revision 1.303
1# Copyright 1999-2006 Gentoo Foundation 1# Copyright 1999-2007 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.256 2006/10/31 19:29:12 agriffis Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.303 2008/09/20 18:32:35 vapier Exp $
4
5# @ECLASS: eutils.eclass
6# @MAINTAINER:
7# base-system@gentoo.org
8# @BLURB: many extra (but common) functions that are used in ebuilds
9# @DESCRIPTION:
10# The eutils eclass contains a suite of functions that complement
11# the ones that ebuild.sh already contain. The idea is that the functions
12# are not required in all ebuilds but enough utilize them to have a common
13# home rather than having multiple ebuilds implementing the same thing.
4# 14#
5# This eclass is for general purpose functions that most ebuilds 15# Due to the nature of this eclass, some functions may have maintainers
6# have to implement themselves. 16# different from the overall eclass!
7#
8# NB: If you add anything, please comment it!
9#
10# Maintainer: see each individual function, base-system@gentoo.org as default
11 17
12inherit multilib portability 18inherit multilib portability
13 19
14DESCRIPTION="Based on the ${ECLASS} eclass" 20DESCRIPTION="Based on the ${ECLASS} eclass"
15 21
16# Wait for the supplied number of seconds. If no argument is supplied, defaults 22# @FUNCTION: epause
17# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 23# @USAGE: [seconds]
18# outputting to a terminal, don't wait. For compatability purposes, the argument 24# @DESCRIPTION:
19# must be an integer greater than zero. 25# Sleep for the specified number of seconds (default of 5 seconds). Useful when
20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 26# printing a message the user should probably be reading and often used in
27# conjunction with the ebeep function. If the EPAUSE_IGNORE env var is set,
28# don't wait at all.
21epause() { 29epause() {
22 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5} 30 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
23} 31}
24 32
25# Beep the specified number of times (defaults to five). If our output 33# @FUNCTION: ebeep
26# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set, 34# @USAGE: [number of beeps]
35# @DESCRIPTION:
36# Issue the specified number of beeps (default of 5 beeps). Useful when
37# printing a message the user should probably be reading and often used in
38# conjunction with the epause function. If the EBEEP_IGNORE env var is set,
27# don't beep. 39# don't beep at all.
28# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
29ebeep() { 40ebeep() {
30 local n 41 local n
31 if [[ -z ${EBEEP_IGNORE} ]] ; then 42 if [[ -z ${EBEEP_IGNORE} ]] ; then
32 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 43 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
33 echo -ne "\a" 44 echo -ne "\a"
36 sleep 1 47 sleep 1
37 done 48 done
38 fi 49 fi
39} 50}
40 51
41# This function generate linker scripts in /usr/lib for dynamic 52# @FUNCTION: ecvs_clean
42# libs in /lib. This is to fix linking problems when you have 53# @USAGE: [list of dirs]
43# the .so in /lib, and the .a in /usr/lib. What happens is that 54# @DESCRIPTION:
44# in some cases when linking dynamic, the .a in /usr/lib is used 55# Remove CVS directories recursiveley. Useful when a source tarball contains
45# instead of the .so in /lib due to gcc/libtool tweaking ld's 56# internal CVS directories. Defaults to $PWD.
46# library search path. This cause many builds to fail. 57ecvs_clean() {
47# See bug #4411 for more info. 58 [[ -z $* ]] && set -- .
48# 59 find "$@" -type d -name 'CVS' -prune -print0 | xargs -0 rm -rf
49# To use, simply call: 60 find "$@" -type f -name '.cvs*' -print0 | xargs -0 rm -rf
50#
51# gen_usr_ldscript libfoo.so
52#
53# Note that you should in general use the unversioned name of
54# the library, as ldconfig should usually update it correctly
55# to point to the latest version of the library present.
56#
57# <azarah@gentoo.org> (26 Oct 2002)
58#
59gen_usr_ldscript() {
60 if [[ $(type -t _tc_gen_usr_ldscript) == "function" ]] ; then
61 _tc_gen_usr_ldscript "$@"
62 return $?
63 fi
64
65 ewarn "QA Notice: Please upgrade your ebuild to use toolchain-funcs"
66 ewarn "QA Notice: rather than gen_usr_ldscript() from eutils"
67
68 local lib libdir=$(get_libdir)
69 # Just make sure it exists
70 dodir /usr/${libdir}
71
72 for lib in "${@}" ; do
73 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
74 /* GNU ld script
75 Since Gentoo has critical dynamic libraries
76 in /lib, and the static versions in /usr/lib,
77 we need to have a "fake" dynamic lib in /usr/lib,
78 otherwise we run into linking problems.
79
80 See bug http://bugs.gentoo.org/4411 for more info.
81 */
82 GROUP ( /${libdir}/${lib} )
83 END_LDSCRIPT
84 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
85 done
86} 61}
87 62
63# @FUNCTION: esvn_clean
64# @USAGE: [list of dirs]
65# @DESCRIPTION:
66# Remove .svn directories recursiveley. Useful when a source tarball contains
67# internal Subversion directories. Defaults to $PWD.
68esvn_clean() {
69 [[ -z $* ]] && set -- .
70 find "$@" -type d -name '.svn' -prune -print0 | xargs -0 rm -rf
71}
88 72
89# Default directory where patches are located 73# Default directory where patches are located
90EPATCH_SOURCE="${WORKDIR}/patch" 74EPATCH_SOURCE="${WORKDIR}/patch"
91# Default extension for patches 75# Default extension for patches
92EPATCH_SUFFIX="patch.bz2" 76EPATCH_SUFFIX="patch.bz2"
93# Default options for patch 77# Default options for patch
94# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 78# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
95# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 79# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
96# Set -E to automatically remove empty files. 80# Set -E to automatically remove empty files.
97EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 81EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
98# List of patches not to apply. Not this is only file names, 82# List of patches not to apply. Not this is only file names,
99# and not the full path .. 83# and not the full path ..
100EPATCH_EXCLUDE="" 84EPATCH_EXCLUDE=""
101# Change the printed message for a single patch. 85# Change the printed message for a single patch.
102EPATCH_SINGLE_MSG="" 86EPATCH_SINGLE_MSG=""
103# Change the printed message for multiple patches. 87# Change the printed message for multiple patches.
104EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 88EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
105# Force applying bulk patches even if not following the style: 89# Force applying bulk patches even if not following the style:
106# 90#
107# ??_${ARCH}_foo.${EPATCH_SUFFIX} 91# ??_${ARCH}_foo.${EPATCH_SUFFIX}
108# 92#
109EPATCH_FORCE="no" 93EPATCH_FORCE="no"
110 94
111# This function is for bulk patching, or in theory for just one 95# This function is for bulk patching, or in theory for just one
112# or two patches. 96# or two patches.
123# 107#
124# Patches are applied in current directory. 108# Patches are applied in current directory.
125# 109#
126# Bulk Patches should preferibly have the form of: 110# Bulk Patches should preferibly have the form of:
127# 111#
128# ??_${ARCH}_foo.${EPATCH_SUFFIX} 112# ??_${ARCH}_foo.${EPATCH_SUFFIX}
129# 113#
130# For example: 114# For example:
131# 115#
132# 01_all_misc-fix.patch.bz2 116# 01_all_misc-fix.patch.bz2
133# 02_sparc_another-fix.patch.bz2 117# 02_sparc_another-fix.patch.bz2
134# 118#
135# This ensures that there are a set order, and you can have ARCH 119# This ensures that there are a set order, and you can have ARCH
136# specific patches. 120# specific patches.
137# 121#
138# If you however give an argument to epatch(), it will treat it as a 122# If you however give an argument to epatch(), it will treat it as a
180 local EPATCH_SOURCE="$1/*" 164 local EPATCH_SOURCE="$1/*"
181 else 165 else
182 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 166 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
183 fi 167 fi
184 else 168 else
185 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ] 169 if [[ ! -d ${EPATCH_SOURCE} ]] || [[ -n $1 ]] ; then
186 then
187 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 170 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
188 then 171 then
189 EPATCH_SOURCE="$1" 172 EPATCH_SOURCE="$1"
190 fi 173 fi
191 174
200 183
201 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 184 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
202 fi 185 fi
203 186
204 case ${EPATCH_SUFFIX##*\.} in 187 case ${EPATCH_SUFFIX##*\.} in
188 lzma)
189 PIPE_CMD="lzma -dc"
190 PATCH_SUFFIX="lzma"
191 ;;
205 bz2) 192 bz2)
206 PIPE_CMD="bzip2 -dc" 193 PIPE_CMD="bzip2 -dc"
207 PATCH_SUFFIX="bz2" 194 PATCH_SUFFIX="bz2"
208 ;; 195 ;;
209 gz|Z|z) 196 gz|Z|z)
226 fi 213 fi
227 for x in ${EPATCH_SOURCE} 214 for x in ${EPATCH_SOURCE}
228 do 215 do
229 # New ARCH dependant patch naming scheme ... 216 # New ARCH dependant patch naming scheme ...
230 # 217 #
231 # ???_arch_foo.patch 218 # ???_arch_foo.patch
232 # 219 #
233 if [ -f ${x} ] && \ 220 if [ -f ${x} ] && \
234 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \ 221 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
235 [ "${EPATCH_FORCE}" = "yes" ]) 222 [ "${EPATCH_FORCE}" = "yes" ])
236 then 223 then
237 local count=0 224 local count=0
238 local popts="${EPATCH_OPTS}" 225 local popts="${EPATCH_OPTS}"
239 local patchname=${x##*/} 226 local patchname=${x##*/}
240 227
268 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 255 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 256 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
270 257
271 if [ "${PATCH_SUFFIX}" != "patch" ] 258 if [ "${PATCH_SUFFIX}" != "patch" ]
272 then 259 then
273 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 260 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
274 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 261 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
275 else 262 else
276 PATCH_TARGET="${x}" 263 PATCH_TARGET="${x}"
277 fi 264 fi
278 265
279 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 266 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
280 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 267 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
281 268
282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
283 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 270 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
284 271
350 then 337 then
351 einfo "Done with patching" 338 einfo "Done with patching"
352 fi 339 fi
353} 340}
354 341
342# @FUNCTION: emktemp
343# @USAGE: [temp dir]
344# @DESCRIPTION:
355# Cheap replacement for when debianutils (and thus mktemp) 345# Cheap replacement for when debianutils (and thus mktemp)
356# does not exist on the users system 346# does not exist on the users system.
357# vapier@gentoo.org
358#
359# Takes just 1 optional parameter (the directory to create tmpfile in)
360emktemp() { 347emktemp() {
361 local exe="touch" 348 local exe="touch"
362 [[ $1 == -d ]] && exe="mkdir" && shift 349 [[ $1 == -d ]] && exe="mkdir" && shift
363 local topdir=$1 350 local topdir=$1
364 351
366 [[ -z ${T} ]] \ 353 [[ -z ${T} ]] \
367 && topdir="/tmp" \ 354 && topdir="/tmp" \
368 || topdir=${T} 355 || topdir=${T}
369 fi 356 fi
370 357
371 if [[ -z $(type -p mktemp) ]] ; then 358 if ! type -P mktemp > /dev/null ; then
359 # system lacks `mktemp` so we have to fake it
372 local tmp=/ 360 local tmp=/
373 while [[ -e ${tmp} ]] ; do 361 while [[ -e ${tmp} ]] ; do
374 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 362 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
375 done 363 done
376 ${exe} "${tmp}" || ${exe} -p "${tmp}" 364 ${exe} "${tmp}" || ${exe} -p "${tmp}"
377 echo "${tmp}" 365 echo "${tmp}"
378 else 366 else
367 # the args here will give slightly wierd names on BSD,
368 # but should produce a usable file on all userlands
379 if [[ ${exe} == "touch" ]] ; then 369 if [[ ${exe} == "touch" ]] ; then
380 [[ ${USERLAND} == "GNU" ]] \
381 && mktemp -p "${topdir}" \
382 || TMPDIR="${topdir}" mktemp -t tmp 370 TMPDIR="${topdir}" mktemp -t tmp.XXXXXXXXXX
383 else 371 else
384 [[ ${USERLAND} == "GNU" ]] \
385 && mktemp -d "${topdir}" \
386 || TMPDIR="${topdir}" mktemp -dt tmp 372 TMPDIR="${topdir}" mktemp -dt tmp.XXXXXXXXXX
387 fi
388 fi 373 fi
374 fi
389} 375}
390 376
377# @FUNCTION: egetent
378# @USAGE: <database> <key>
379# @MAINTAINER:
380# base-system@gentoo.org (Linux)
381# Joe Jezak <josejx@gmail.com> (OS X)
382# usata@gentoo.org (OS X)
383# Aaron Walker <ka0ttic@gentoo.org> (FreeBSD)
384# @DESCRIPTION:
391# Small wrapper for getent (Linux), nidump (Mac OS X), 385# Small wrapper for getent (Linux), nidump (Mac OS X),
392# and pw (FreeBSD) used in enewuser()/enewgroup() 386# and pw (FreeBSD) used in enewuser()/enewgroup()
393# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
394# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
395#
396# egetent(database, key)
397egetent() { 387egetent() {
398 case ${CHOST} in 388 case ${CHOST} in
399 *-darwin*) 389 *-darwin*)
400 case "$2" in 390 case "$2" in
401 *[!0-9]*) # Non numeric 391 *[!0-9]*) # Non numeric
425 getent "$1" "$2" 415 getent "$1" "$2"
426 ;; 416 ;;
427 esac 417 esac
428} 418}
429 419
430# Simplify/standardize adding users to the system 420# @FUNCTION: enewuser
431# vapier@gentoo.org 421# @USAGE: <user> [uid] [shell] [homedir] [groups] [params]
432# 422# @DESCRIPTION:
433# enewuser(username, uid, shell, homedir, groups, extra options) 423# Same as enewgroup, you are not required to understand how to properly add
434# 424# a user to the system. The only required parameter is the username.
435# Default values if you do not specify any: 425# Default uid is (pass -1 for this) next available, default shell is
436# username: REQUIRED ! 426# /bin/false, default homedir is /dev/null, there are no default groups,
437# uid: next available (see useradd(8)) 427# and default params sets the comment as 'added by portage for ${PN}'.
438# note: pass -1 to get default behavior
439# shell: /bin/false
440# homedir: /dev/null
441# groups: none
442# extra: comment of 'added by portage for ${PN}'
443enewuser() { 428enewuser() {
444 case ${EBUILD_PHASE} in 429 case ${EBUILD_PHASE} in
445 unpack|compile|test|install) 430 unpack|compile|test|install)
446 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function." 431 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
447 eerror "Package fails at QA and at life. Please file a bug." 432 eerror "Package fails at QA and at life. Please file a bug."
636 fi 621 fi
637 622
638 export SANDBOX_ON=${oldsandbox} 623 export SANDBOX_ON=${oldsandbox}
639} 624}
640 625
641# Simplify/standardize adding groups to the system 626# @FUNCTION: enewgroup
642# vapier@gentoo.org 627# @USAGE: <group> [gid]
643# 628# @DESCRIPTION:
644# enewgroup(group, gid) 629# This function does not require you to understand how to properly add a
645# 630# group to the system. Just give it a group name to add and enewgroup will
646# Default values if you do not specify any: 631# do the rest. You may specify the gid for the group or allow the group to
647# groupname: REQUIRED ! 632# allocate the next available one.
648# gid: next available (see groupadd(8))
649# extra: none
650enewgroup() { 633enewgroup() {
651 case ${EBUILD_PHASE} in 634 case ${EBUILD_PHASE} in
652 unpack|compile|test|install) 635 unpack|compile|test|install)
653 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function." 636 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
654 eerror "Package fails at QA and at life. Please file a bug." 637 eerror "Package fails at QA and at life. Please file a bug."
750 ;; 733 ;;
751 esac 734 esac
752 export SANDBOX_ON="${oldsandbox}" 735 export SANDBOX_ON="${oldsandbox}"
753} 736}
754 737
755# Simple script to replace 'dos2unix' binaries 738# @FUNCTION: edos2unix
756# vapier@gentoo.org 739# @USAGE: <file> [more files ...]
757# 740# @DESCRIPTION:
758# edos2unix(file, <more files> ...) 741# A handy replacement for dos2unix, recode, fixdos, etc... This allows you
742# to remove all of these text utilities from DEPEND variables because this
743# is a script based solution. Just give it a list of files to convert and
744# they will all be changed from the DOS CRLF format to the UNIX LF format.
759edos2unix() { 745edos2unix() {
760 for f in "$@" 746 echo "$@" | xargs sed -i 's/\r$//'
761 do
762 cp "${f}" ${T}/edos2unix
763 sed 's/\r$//' ${T}/edos2unix > "${f}"
764 done
765} 747}
766
767
768##############################################################
769# START: Handle .desktop files and menu entries #
770# maybe this should be separated into a new eclass some time #
771# lanius@gentoo.org #
772##############################################################
773 748
774# Make a desktop file ! 749# Make a desktop file !
775# Great for making those icons in kde/gnome startmenu ! 750# Great for making those icons in kde/gnome startmenu !
776# Amaze your friends ! Get the women ! Join today ! 751# Amaze your friends ! Get the women ! Join today !
777# 752#
778# make_desktop_entry(<command>, [name], [icon], [type], [path]) 753# make_desktop_entry(<command>, [name], [icon], [type], [path])
779# 754#
780# binary: what command does the app run with ? 755# binary: what command does the app run with ?
781# name: the name that will show up in the menu 756# name: the name that will show up in the menu
782# icon: give your little like a pretty little icon ... 757# icon: give your little like a pretty little icon ...
783# this can be relative (to /usr/share/pixmaps) or 758# this can be relative (to /usr/share/pixmaps) or
784# a full path to an icon 759# a full path to an icon
785# type: what kind of application is this ? for categories: 760# type: what kind of application is this ? for categories:
786# http://www.freedesktop.org/Standards/desktop-entry-spec 761# http://standards.freedesktop.org/menu-spec/latest/apa.html
787# path: if your app needs to startup in a specific dir 762# path: if your app needs to startup in a specific dir
788make_desktop_entry() { 763make_desktop_entry() {
789 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 764 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
790 765
791 local exec=${1} 766 local exec=${1}
792 local name=${2:-${PN}} 767 local name=${2:-${PN}}
793 local icon=${3:-${PN}.png} 768 local icon=${3:-${PN}}
794 local type=${4} 769 local type=${4}
795 local path=${5} 770 local path=${5}
796 771
797 if [[ -z ${type} ]] ; then 772 if [[ -z ${type} ]] ; then
798 local catmaj=${CATEGORY%%-*} 773 local catmaj=${CATEGORY%%-*}
799 local catmin=${CATEGORY##*-} 774 local catmin=${CATEGORY##*-}
800 case ${catmaj} in 775 case ${catmaj} in
801 app) 776 app)
802 case ${catmin} in 777 case ${catmin} in
778 accessibility) type=Accessibility;;
803 admin) type=System;; 779 admin) type=System;;
780 antivirus) type=System;;
781 arch) type=Archiving;;
782 backup) type=Archiving;;
804 cdr) type=DiscBurning;; 783 cdr) type=DiscBurning;;
805 dicts) type=Dictionary;; 784 dicts) type=Dictionary;;
785 doc) type=Documentation;;
806 editors) type=TextEditor;; 786 editors) type=TextEditor;;
807 emacs) type=TextEditor;; 787 emacs) type=TextEditor;;
808 emulation) type=Emulator;; 788 emulation) type=Emulator;;
809 laptop) type=HardwareSettings;; 789 laptop) type=HardwareSettings;;
810 office) type=Office;; 790 office) type=Office;;
791 pda) type=PDA;;
811 vim) type=TextEditor;; 792 vim) type=TextEditor;;
812 xemacs) type=TextEditor;; 793 xemacs) type=TextEditor;;
813 *) type=;; 794 *) type=;;
814 esac 795 esac
815 ;; 796 ;;
816 797
817 dev) 798 dev)
818 type="Development" 799 type="Development"
819 ;; 800 ;;
820 801
821 games) 802 games)
822 case ${catmin} in 803 case ${catmin} in
823 action) type=ActionGame;; 804 action|fps) type=ActionGame;;
824 arcade) type=ArcadeGame;; 805 arcade) type=ArcadeGame;;
825 board) type=BoardGame;; 806 board) type=BoardGame;;
826 kids) type=KidsGame;;
827 emulation) type=Emulator;; 807 emulation) type=Emulator;;
808 kids) type=KidsGame;;
828 puzzle) type=LogicGame;; 809 puzzle) type=LogicGame;;
829 rpg) type=RolePlaying;;
830 roguelike) type=RolePlaying;; 810 roguelike) type=RolePlaying;;
811 rpg) type=RolePlaying;;
831 simulation) type=Simulation;; 812 simulation) type=Simulation;;
832 sports) type=SportsGame;; 813 sports) type=SportsGame;;
833 strategy) type=StrategyGame;; 814 strategy) type=StrategyGame;;
834 *) type=;; 815 *) type=;;
835 esac 816 esac
836 type="Game;${type}" 817 type="Game;${type}"
818 ;;
819
820 gnome)
821 type="Gnome;GTK"
822 ;;
823
824 kde)
825 type="KDE;Qt"
837 ;; 826 ;;
838 827
839 mail) 828 mail)
840 type="Network;Email" 829 type="Network;Email"
841 ;; 830 ;;
843 media) 832 media)
844 case ${catmin} in 833 case ${catmin} in
845 gfx) type=Graphics;; 834 gfx) type=Graphics;;
846 radio) type=Tuner;; 835 radio) type=Tuner;;
847 sound) type=Audio;; 836 sound) type=Audio;;
848 tv) type=TV;; 837 tv) type=TV;;
849 video) type=Video;; 838 video) type=Video;;
850 *) type=;; 839 *) type=;;
851 esac 840 esac
852 type="AudioVideo;${type}" 841 type="AudioVideo;${type}"
853 ;; 842 ;;
854 843
855 net) 844 net)
856 case ${catmin} in 845 case ${catmin} in
857 dialup) type=Dialup;; 846 dialup) type=Dialup;;
858 ftp) type=FileTransfer;; 847 ftp) type=FileTransfer;;
859 im) type=InstantMessaging;; 848 im) type=InstantMessaging;;
860 irc) type=IRCClient;; 849 irc) type=IRCClient;;
861 mail) type=Email;; 850 mail) type=Email;;
862 news) type=News;; 851 news) type=News;;
863 nntp) type=News;; 852 nntp) type=News;;
864 p2p) type=FileTransfer;; 853 p2p) type=FileTransfer;;
865 *) type=;; 854 *) type=;;
866 esac 855 esac
867 type="Network;${type}" 856 type="Network;${type}"
868 ;; 857 ;;
869 858
870 sci) 859 sci)
871 case ${catmin} in 860 case ${catmin} in
872 astro*) type=Astronomy;; 861 astro*) type=Astronomy;;
873 bio*) type=Biology;; 862 bio*) type=Biology;;
874 calc*) type=Calculator;; 863 calc*) type=Calculator;;
875 chem*) type=Chemistry;; 864 chem*) type=Chemistry;;
865 elec*) type=Electronics;;
876 geo*) type=Geology;; 866 geo*) type=Geology;;
877 math*) type=Math;; 867 math*) type=Math;;
868 physics) type=Physics;;
869 visual*) type=DataVisualization;;
878 *) type=;; 870 *) type=;;
879 esac 871 esac
880 type="Science;${type}" 872 type="Science;${type}"
881 ;; 873 ;;
882 874
875 sys)
876 type="System"
877 ;;
878
883 www) 879 www)
884 case ${catmin} in 880 case ${catmin} in
885 client) type=WebBrowser;; 881 client) type=WebBrowser;;
886 *) type=;; 882 *) type=;;
887 esac 883 esac
888 type="Network" 884 type="Network"
889 ;; 885 ;;
890 886
891 *) 887 *)
896 if [ "${SLOT}" == "0" ] ; then 892 if [ "${SLOT}" == "0" ] ; then
897 local desktop_name="${PN}" 893 local desktop_name="${PN}"
898 else 894 else
899 local desktop_name="${PN}-${SLOT}" 895 local desktop_name="${PN}-${SLOT}"
900 fi 896 fi
901 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 897 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
902# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 898 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
903 899
900 cat <<-EOF > "${desktop}"
904echo "[Desktop Entry] 901 [Desktop Entry]
905Encoding=UTF-8 902 Version=1.0
906Version=0.9.2
907Name=${name} 903 Name=${name}
908Type=Application 904 Type=Application
909Comment=${DESCRIPTION} 905 Comment=${DESCRIPTION}
910Exec=${exec} 906 Exec=${exec}
911TryExec=${exec%% *} 907 TryExec=${exec%% *}
912Path=${path}
913Icon=${icon} 908 Icon=${icon}
914Categories=Application;${type};" > "${desktop}" 909 Categories=${type};
910 EOF
911
912 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}"
915 913
916 ( 914 (
917 # wrap the env here so that the 'insinto' call 915 # wrap the env here so that the 'insinto' call
918 # doesn't corrupt the env of the caller 916 # doesn't corrupt the env of the caller
919 insinto /usr/share/applications 917 insinto /usr/share/applications
920 doins "${desktop}" 918 doins "${desktop}"
921 ) 919 )
922} 920}
923 921
924# Make a GDM/KDM Session file 922# @FUNCTION: validate_desktop_entries
925# 923# @USAGE: [directories]
926# make_session_desktop(<title>, <command>) 924# @MAINTAINER:
927# title: File to execute to start the Window Manager 925# Carsten Lohrke <carlo@gentoo.org>
928# command: Name of the Window Manager 926# @DESCRIPTION:
927# Validate desktop entries using desktop-file-utils
928validate_desktop_entries() {
929 if [[ -x /usr/bin/desktop-file-validate ]] ; then
930 einfo "Checking desktop entry validity"
931 local directories=""
932 for d in /usr/share/applications $@ ; do
933 [[ -d ${D}${d} ]] && directories="${directories} ${D}${d}"
934 done
935 if [[ -n ${directories} ]] ; then
936 for FILE in $(find ${directories} -name "*\.desktop" \
937 -not -path '*.hidden*' | sort -u 2>/dev/null)
938 do
939 local temp=$(desktop-file-validate ${FILE} | grep -v "warning:" | \
940 sed -e "s|error: ||" -e "s|${FILE}:|--|g" )
941 [[ -n $temp ]] && elog ${temp/--/${FILE/${D}/}:}
942 done
943 fi
944 echo ""
945 else
946 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
947 fi
948}
929 949
950# @FUNCTION: make_session_desktop
951# @USAGE: <title> <command>
952# @DESCRIPTION:
953# Make a GDM/KDM Session file. The title is the file to execute to start the
954# Window Manager. The command is the name of the Window Manager.
930make_session_desktop() { 955make_session_desktop() {
931 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 956 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
932 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1 957 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
933 958
934 local title=$1 959 local title=$1
935 local command=$2 960 local command=$2
936 local desktop=${T}/${wm}.desktop 961 local desktop=${T}/${wm}.desktop
937 962
963 cat <<-EOF > "${desktop}"
938echo "[Desktop Entry] 964 [Desktop Entry]
939Encoding=UTF-8
940Name=${title} 965 Name=${title}
941Comment=This session logs you into ${title} 966 Comment=This session logs you into ${title}
942Exec=${command} 967 Exec=${command}
943TryExec=${command} 968 TryExec=${command}
944Type=Application" > "${desktop}" 969 Type=Application
970 EOF
945 971
972 (
973 # wrap the env here so that the 'insinto' call
974 # doesn't corrupt the env of the caller
946 insinto /usr/share/xsessions 975 insinto /usr/share/xsessions
947 doins "${desktop}" 976 doins "${desktop}"
977 )
948} 978}
949 979
980# @FUNCTION: domenu
981# @USAGE: <menus>
982# @DESCRIPTION:
983# Install the list of .desktop menu files into the appropriate directory
984# (/usr/share/applications).
950domenu() { 985domenu() {
986 (
987 # wrap the env here so that the 'insinto' call
988 # doesn't corrupt the env of the caller
951 local i j 989 local i j ret=0
952 insinto /usr/share/applications 990 insinto /usr/share/applications
953 for i in "$@" ; do 991 for i in "$@" ; do
954 if [[ -f ${i} ]] ; then 992 if [[ -f ${i} ]] ; then
955 doins "${i}" 993 doins "${i}"
994 ((ret+=$?))
956 elif [[ -d ${i} ]] ; then 995 elif [[ -d ${i} ]] ; then
957 for j in "${i}"/*.desktop ; do 996 for j in "${i}"/*.desktop ; do
958 doins "${j}" 997 doins "${j}"
998 ((ret+=$?))
959 done 999 done
1000 else
1001 ((++ret))
960 fi 1002 fi
961 done 1003 done
1004 exit ${ret}
1005 )
962} 1006}
1007
1008# @FUNCTION: newmenu
1009# @USAGE: <menu> <newname>
1010# @DESCRIPTION:
1011# Like all other new* functions, install the specified menu as newname.
963newmenu() { 1012newmenu() {
1013 (
1014 # wrap the env here so that the 'insinto' call
1015 # doesn't corrupt the env of the caller
964 insinto /usr/share/applications 1016 insinto /usr/share/applications
965 newins "$1" "$2" 1017 newins "$@"
1018 )
966} 1019}
967 1020
1021# @FUNCTION: doicon
1022# @USAGE: <list of icons>
1023# @DESCRIPTION:
1024# Install the list of icons into the icon directory (/usr/share/pixmaps).
1025# This is useful in conjunction with creating desktop/menu files.
968doicon() { 1026doicon() {
1027 (
1028 # wrap the env here so that the 'insinto' call
1029 # doesn't corrupt the env of the caller
969 local i j 1030 local i j ret
970 insinto /usr/share/pixmaps 1031 insinto /usr/share/pixmaps
971 for i in "$@" ; do 1032 for i in "$@" ; do
972 if [[ -f ${i} ]] ; then 1033 if [[ -f ${i} ]] ; then
973 doins "${i}" 1034 doins "${i}"
1035 ((ret+=$?))
974 elif [[ -d ${i} ]] ; then 1036 elif [[ -d ${i} ]] ; then
975 for j in "${i}"/*.png ; do 1037 for j in "${i}"/*.png ; do
976 doins "${j}" 1038 doins "${j}"
1039 ((ret+=$?))
977 done 1040 done
1041 else
1042 ((++ret))
978 fi 1043 fi
979 done 1044 done
1045 exit ${ret}
1046 )
980} 1047}
1048
1049# @FUNCTION: newicon
1050# @USAGE: <icon> <newname>
1051# @DESCRIPTION:
1052# Like all other new* functions, install the specified icon as newname.
981newicon() { 1053newicon() {
1054 (
1055 # wrap the env here so that the 'insinto' call
1056 # doesn't corrupt the env of the caller
982 insinto /usr/share/pixmaps 1057 insinto /usr/share/pixmaps
983 newins "$1" "$2" 1058 newins "$@"
1059 )
984} 1060}
985
986##############################################################
987# END: Handle .desktop files and menu entries #
988##############################################################
989
990 1061
991# for internal use only (unpack_pdv and unpack_makeself) 1062# for internal use only (unpack_pdv and unpack_makeself)
992find_unpackable_file() { 1063find_unpackable_file() {
993 local src=$1 1064 local src=$1
994 if [[ -z ${src} ]] ; then 1065 if [[ -z ${src} ]] ; then
1004 fi 1075 fi
1005 [[ ! -e ${src} ]] && return 1 1076 [[ ! -e ${src} ]] && return 1
1006 echo "${src}" 1077 echo "${src}"
1007} 1078}
1008 1079
1080# @FUNCTION: unpack_pdv
1081# @USAGE: <file to unpack> <size of off_t>
1082# @DESCRIPTION:
1009# Unpack those pesky pdv generated files ... 1083# Unpack those pesky pdv generated files ...
1010# They're self-unpacking programs with the binary package stuffed in 1084# They're self-unpacking programs with the binary package stuffed in
1011# the middle of the archive. Valve seems to use it a lot ... too bad 1085# the middle of the archive. Valve seems to use it a lot ... too bad
1012# it seems to like to segfault a lot :(. So lets take it apart ourselves. 1086# it seems to like to segfault a lot :(. So lets take it apart ourselves.
1013# 1087#
1014# Usage: unpack_pdv [file to unpack] [size of off_t]
1015# - you have to specify the off_t size ... i have no idea how to extract that 1088# You have to specify the off_t size ... I have no idea how to extract that
1016# information out of the binary executable myself. basically you pass in 1089# information out of the binary executable myself. Basically you pass in
1017# the size of the off_t type (in bytes) on the machine that built the pdv 1090# the size of the off_t type (in bytes) on the machine that built the pdv
1091# archive.
1092#
1018# archive. one way to determine this is by running the following commands: 1093# One way to determine this is by running the following commands:
1094#
1095# @CODE
1019# strings <pdv archive> | grep lseek 1096# strings <pdv archive> | grep lseek
1020# strace -elseek <pdv archive> 1097# strace -elseek <pdv archive>
1098# @CODE
1099#
1021# basically look for the first lseek command (we do the strings/grep because 1100# Basically look for the first lseek command (we do the strings/grep because
1022# sometimes the function call is _llseek or something) and steal the 2nd 1101# sometimes the function call is _llseek or something) and steal the 2nd
1023# parameter. here is an example: 1102# parameter. Here is an example:
1103#
1104# @CODE
1024# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1105# vapier@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1025# lseek 1106# lseek
1026# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1107# vapier@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1027# lseek(3, -4, SEEK_END) = 2981250 1108# lseek(3, -4, SEEK_END) = 2981250
1109# @CODE
1110#
1028# thus we would pass in the value of '4' as the second parameter. 1111# Thus we would pass in the value of '4' as the second parameter.
1029unpack_pdv() { 1112unpack_pdv() {
1030 local src=$(find_unpackable_file $1) 1113 local src=$(find_unpackable_file "$1")
1031 local sizeoff_t=$2 1114 local sizeoff_t=$2
1032 1115
1033 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1116 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1034 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :(" 1117 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1035 1118
1036 local shrtsrc=$(basename "${src}") 1119 local shrtsrc=$(basename "${src}")
1037 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1120 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1038 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1121 local metaskip=$(tail -c ${sizeoff_t} "${src}" | hexdump -e \"%i\")
1039 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1122 local tailskip=$(tail -c $((${sizeoff_t}*2)) "${src}" | head -c ${sizeoff_t} | hexdump -e \"%i\")
1040 1123
1041 # grab metadata for debug reasons 1124 # grab metadata for debug reasons
1042 local metafile="$(emktemp)" 1125 local metafile=$(emktemp)
1043 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1126 tail -c +$((${metaskip}+1)) "${src}" > "${metafile}"
1044 1127
1045 # rip out the final file name from the metadata 1128 # rip out the final file name from the metadata
1046 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1129 local datafile=$(tail -c +$((${metaskip}+1)) "${src}" | strings | head -n 1)
1047 datafile="`basename ${datafile}`" 1130 datafile=$(basename "${datafile}")
1048 1131
1049 # now lets uncompress/untar the file if need be 1132 # now lets uncompress/untar the file if need be
1050 local tmpfile="$(emktemp)" 1133 local tmpfile=$(emktemp)
1051 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1134 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1052 1135
1053 local iscompressed="`file -b ${tmpfile}`" 1136 local iscompressed=$(file -b "${tmpfile}")
1054 if [ "${iscompressed:0:8}" == "compress" ] ; then 1137 if [[ ${iscompressed:0:8} == "compress" ]] ; then
1055 iscompressed=1 1138 iscompressed=1
1056 mv ${tmpfile}{,.Z} 1139 mv ${tmpfile}{,.Z}
1057 gunzip ${tmpfile} 1140 gunzip ${tmpfile}
1058 else 1141 else
1059 iscompressed=0 1142 iscompressed=0
1060 fi 1143 fi
1061 local istar="`file -b ${tmpfile}`" 1144 local istar=$(file -b "${tmpfile}")
1062 if [ "${istar:0:9}" == "POSIX tar" ] ; then 1145 if [[ ${istar:0:9} == "POSIX tar" ]] ; then
1063 istar=1 1146 istar=1
1064 else 1147 else
1065 istar=0 1148 istar=0
1066 fi 1149 fi
1067 1150
1095 true 1178 true
1096 #[ -s "${datafile}" ] || die "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')" 1179 #[ -s "${datafile}" ] || die "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')"
1097 #assert "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')" 1180 #assert "failure unpacking pdv ('${metaskip}' '${tailskip}' '${datafile}')"
1098} 1181}
1099 1182
1183# @FUNCTION: unpack_makeself
1184# @USAGE: [file to unpack] [offset] [tail|dd]
1185# @DESCRIPTION:
1100# Unpack those pesky makeself generated files ... 1186# Unpack those pesky makeself generated files ...
1101# They're shell scripts with the binary package tagged onto 1187# They're shell scripts with the binary package tagged onto
1102# the end of the archive. Loki utilized the format as does 1188# the end of the archive. Loki utilized the format as does
1103# many other game companies. 1189# many other game companies.
1104# 1190#
1105# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1191# If the file is not specified, then ${A} is used. If the
1106# - If the file is not specified then unpack will utilize ${A}.
1107# - If the offset is not specified then we will attempt to extract 1192# offset is not specified then we will attempt to extract
1108# the proper offset from the script itself. 1193# the proper offset from the script itself.
1109unpack_makeself() { 1194unpack_makeself() {
1110 local src_input=${1:-${A}} 1195 local src_input=${1:-${A}}
1111 local src=$(find_unpackable_file "${src_input}") 1196 local src=$(find_unpackable_file "${src_input}")
1112 local skip=$2 1197 local skip=$2
1113 local exe=$3 1198 local exe=$3
1159 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1244 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1160 *) die "makeself cant handle exe '${exe}'" 1245 *) die "makeself cant handle exe '${exe}'"
1161 esac 1246 esac
1162 1247
1163 # lets grab the first few bytes of the file to figure out what kind of archive it is 1248 # lets grab the first few bytes of the file to figure out what kind of archive it is
1164 local tmpfile="$(emktemp)" 1249 local tmpfile=$(emktemp)
1165 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1250 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1166 local filetype="$(file -b "${tmpfile}")" 1251 local filetype=$(file -b "${tmpfile}")
1167 case ${filetype} in 1252 case ${filetype} in
1168 *tar\ archive) 1253 *tar\ archive*)
1169 eval ${exe} | tar --no-same-owner -xf - 1254 eval ${exe} | tar --no-same-owner -xf -
1170 ;; 1255 ;;
1171 bzip2*) 1256 bzip2*)
1172 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1257 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1173 ;; 1258 ;;
1183 ;; 1268 ;;
1184 esac 1269 esac
1185 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})" 1270 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})"
1186} 1271}
1187 1272
1273# @FUNCTION: check_license
1274# @USAGE: [license]
1275# @DESCRIPTION:
1188# Display a license for user to accept. 1276# Display a license for user to accept. If no license is
1189#
1190# Usage: check_license [license]
1191# - If the file is not specified then ${LICENSE} is used. 1277# specified, then ${LICENSE} is used.
1192check_license() { 1278check_license() {
1193 local lic=$1 1279 local lic=$1
1194 if [ -z "${lic}" ] ; then 1280 if [ -z "${lic}" ] ; then
1195 lic="${PORTDIR}/licenses/${LICENSE}" 1281 lic="${PORTDIR}/licenses/${LICENSE}"
1196 else 1282 else
1216 return 0 1302 return 0
1217 fi 1303 fi
1218 done 1304 done
1219 set +o noglob; set -$shopts #reset old shell opts 1305 set +o noglob; set -$shopts #reset old shell opts
1220 1306
1221 local licmsg="$(emktemp)" 1307 local licmsg=$(emktemp)
1222 cat << EOF > ${licmsg} 1308 cat <<-EOF > ${licmsg}
1223********************************************************** 1309 **********************************************************
1224The following license outlines the terms of use of this 1310 The following license outlines the terms of use of this
1225package. You MUST accept this license for installation to 1311 package. You MUST accept this license for installation to
1226continue. When you are done viewing, hit 'q'. If you 1312 continue. When you are done viewing, hit 'q'. If you
1227CTRL+C out of this, the install will not run! 1313 CTRL+C out of this, the install will not run!
1228********************************************************** 1314 **********************************************************
1229 1315
1230EOF 1316 EOF
1231 cat ${lic} >> ${licmsg} 1317 cat ${lic} >> ${licmsg}
1232 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}" 1318 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}"
1233 einfon "Do you accept the terms of this license (${l})? [yes/no] " 1319 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1234 read alic 1320 read alic
1235 case ${alic} in 1321 case ${alic} in
1242 die "Failed to accept license" 1328 die "Failed to accept license"
1243 ;; 1329 ;;
1244 esac 1330 esac
1245} 1331}
1246 1332
1333# @FUNCTION: cdrom_get_cds
1334# @USAGE: <file on cd1> [file on cd2] [file on cd3] [...]
1335# @DESCRIPTION:
1247# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates 1336# Aquire cd(s) for those lovely cd-based emerges. Yes, this violates
1248# the whole 'non-interactive' policy, but damnit I want CD support ! 1337# the whole 'non-interactive' policy, but damnit I want CD support !
1249# 1338#
1250# with these cdrom functions we handle all the user interaction and 1339# With these cdrom functions we handle all the user interaction and
1251# standardize everything. all you have to do is call cdrom_get_cds() 1340# standardize everything. All you have to do is call cdrom_get_cds()
1252# and when the function returns, you can assume that the cd has been 1341# and when the function returns, you can assume that the cd has been
1253# found at CDROM_ROOT. 1342# found at CDROM_ROOT.
1254# 1343#
1344# The function will attempt to locate a cd based upon a file that is on
1345# the cd. The more files you give this function, the more cds
1346# the cdrom functions will handle.
1347#
1255# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1348# Normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1256# etc... if you want to give the cds better names, then just export 1349# etc... If you want to give the cds better names, then just export
1257# the appropriate CDROM_NAME variable before calling cdrom_get_cds(). 1350# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1258# - CDROM_NAME="fooie cd" - for when you only want 1 cd 1351# Use CDROM_NAME for one cd, or CDROM_NAME_# for multiple cds. You can
1259# - CDROM_NAME_1="install cd" - for when you want more than 1 cd 1352# also use the CDROM_NAME_SET bash array.
1260# CDROM_NAME_2="data cd"
1261# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1262# 1353#
1263# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1354# For those multi cd ebuilds, see the cdrom_load_next_cd() function.
1264#
1265# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1266# - this will attempt to locate a cd based upon a file that is on
1267# the cd ... the more files you give this function, the more cds
1268# the cdrom functions will handle
1269cdrom_get_cds() { 1355cdrom_get_cds() {
1270 # first we figure out how many cds we're dealing with by 1356 # first we figure out how many cds we're dealing with by
1271 # the # of files they gave us 1357 # the # of files they gave us
1272 local cdcnt=0 1358 local cdcnt=0
1273 local f= 1359 local f=
1359 export CDROM_SET="" 1445 export CDROM_SET=""
1360 export CDROM_CURRENT_CD=0 1446 export CDROM_CURRENT_CD=0
1361 cdrom_load_next_cd 1447 cdrom_load_next_cd
1362} 1448}
1363 1449
1364# this is only used when you need access to more than one cd. 1450# @FUNCTION: cdrom_load_next_cd
1365# when you have finished using the first cd, just call this function. 1451# @DESCRIPTION:
1366# when it returns, CDROM_ROOT will be pointing to the second cd. 1452# Some packages are so big they come on multiple CDs. When you're done reading
1367# remember, you can only go forward in the cd chain, you can't go back. 1453# files off a CD and want access to the next one, just call this function.
1454# Again, all the messy details of user interaction are taken care of for you.
1455# Once this returns, just read the variable CDROM_ROOT for the location of the
1456# mounted CD. Note that you can only go forward in the CD list, so make sure
1457# you only call this function when you're done using the current CD.
1368cdrom_load_next_cd() { 1458cdrom_load_next_cd() {
1369 local var 1459 local var
1370 ((++CDROM_CURRENT_CD)) 1460 ((++CDROM_CURRENT_CD))
1371 1461
1372 unset CDROM_ROOT 1462 unset CDROM_ROOT
1389# displayed and we'll hang out here until: 1479# displayed and we'll hang out here until:
1390# (1) the file is found on a mounted cdrom 1480# (1) the file is found on a mounted cdrom
1391# (2) the user hits CTRL+C 1481# (2) the user hits CTRL+C
1392_cdrom_locate_file_on_cd() { 1482_cdrom_locate_file_on_cd() {
1393 local mline="" 1483 local mline=""
1394 local showedmsg=0 1484 local showedmsg=0 showjolietmsg=0
1395 1485
1396 while [[ -z ${CDROM_ROOT} ]] ; do 1486 while [[ -z ${CDROM_ROOT} ]] ; do
1397 local i=0 1487 local i=0
1398 local -a cdset=(${*//:/ }) 1488 local -a cdset=(${*//:/ })
1399 if [[ -n ${CDROM_SET} ]] ; then 1489 if [[ -n ${CDROM_SET} ]] ; then
1402 1492
1403 while [[ -n ${cdset[${i}]} ]] ; do 1493 while [[ -n ${cdset[${i}]} ]] ; do
1404 local dir=$(dirname ${cdset[${i}]}) 1494 local dir=$(dirname ${cdset[${i}]})
1405 local file=$(basename ${cdset[${i}]}) 1495 local file=$(basename ${cdset[${i}]})
1406 1496
1407 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do 1497 local point= node= fs= foo=
1498 while read point node fs foo ; do
1499 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \
1500 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1501 && continue
1502 point=${point//\040/ }
1408 [[ -d ${mline}/${dir} ]] || continue 1503 [[ ! -d ${point}/${dir} ]] && continue
1409 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then 1504 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1410 export CDROM_ROOT=${mline} 1505 export CDROM_ROOT=${point}
1411 export CDROM_SET=${i} 1506 export CDROM_SET=${i}
1412 export CDROM_MATCH=${cdset[${i}]} 1507 export CDROM_MATCH=${cdset[${i}]}
1413 return 1508 return
1414 fi 1509 done <<< "$(get_mounts)"
1415 done
1416 1510
1417 ((++i)) 1511 ((++i))
1418 done 1512 done
1419 1513
1420 echo 1514 echo
1436 showedmsg=1 1530 showedmsg=1
1437 fi 1531 fi
1438 einfo "Press return to scan for the cd again" 1532 einfo "Press return to scan for the cd again"
1439 einfo "or hit CTRL+C to abort the emerge." 1533 einfo "or hit CTRL+C to abort the emerge."
1440 echo 1534 echo
1535 if [[ ${showjolietmsg} -eq 0 ]] ; then
1536 showjolietmsg=1
1537 else
1441 einfo "If you are having trouble with the detection" 1538 ewarn "If you are having trouble with the detection"
1442 einfo "of your CD, it is possible that you do not have" 1539 ewarn "of your CD, it is possible that you do not have"
1443 einfo "Joliet support enabled in your kernel. Please" 1540 ewarn "Joliet support enabled in your kernel. Please"
1444 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1541 ewarn "check that CONFIG_JOLIET is enabled in your kernel."
1542 ebeep 5
1543 fi
1445 read || die "something is screwed with your system" 1544 read || die "something is screwed with your system"
1446 done 1545 done
1447} 1546}
1448 1547
1548# @FUNCTION: strip-linguas
1549# @USAGE: [<allow LINGUAS>|<-i|-u> <directories of .po files>]
1550# @DESCRIPTION:
1449# Make sure that LINGUAS only contains languages that 1551# Make sure that LINGUAS only contains languages that
1450# a package can support 1552# a package can support. The first form allows you to
1451# 1553# specify a list of LINGUAS. The -i builds a list of po
1452# usage: strip-linguas <allow LINGUAS> 1554# files found in all the directories and uses the
1453# strip-linguas -i <directories of .po files> 1555# intersection of the lists. The -u builds a list of po
1454# strip-linguas -u <directories of .po files> 1556# files found in all the directories and uses the union
1455# 1557# of the lists.
1456# The first form allows you to specify a list of LINGUAS.
1457# The -i builds a list of po files found in all the
1458# directories and uses the intersection of the lists.
1459# The -u builds a list of po files found in all the
1460# directories and uses the union of the lists.
1461strip-linguas() { 1558strip-linguas() {
1462 local ls newls nols 1559 local ls newls nols
1463 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1560 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1464 local op=$1; shift 1561 local op=$1; shift
1465 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1562 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1495 [[ -n ${nols} ]] \ 1592 [[ -n ${nols} ]] \
1496 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols} 1593 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1497 export LINGUAS=${newls:1} 1594 export LINGUAS=${newls:1}
1498} 1595}
1499 1596
1500# moved from kernel.eclass since they are generally useful outside of 1597# @FUNCTION: preserve_old_lib
1501# kernel.eclass -iggy (20041002) 1598# @USAGE: <libs to preserve> [more libs]
1502 1599# @DESCRIPTION:
1503# the following functions are useful in kernel module ebuilds, etc.
1504# for an example see ivtv or drbd ebuilds
1505
1506# set's ARCH to match what the kernel expects
1507set_arch_to_kernel() {
1508 i=10
1509 while ((i--)) ; do
1510 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1511 done
1512 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1513 case ${ARCH} in
1514 x86) export ARCH="i386";;
1515 amd64) export ARCH="x86_64";;
1516 hppa) export ARCH="parisc";;
1517 mips) export ARCH="mips";;
1518 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
1519 *) export ARCH="${ARCH}";;
1520 esac
1521}
1522
1523# set's ARCH back to what portage expects
1524set_arch_to_portage() {
1525 i=10
1526 while ((i--)) ; do
1527 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1528 done
1529 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1530}
1531
1532# Jeremy Huddleston <eradicator@gentoo.org>:
1533# preserve_old_lib /path/to/libblah.so.0
1534# preserve_old_lib_notify /path/to/libblah.so.0
1535#
1536# These functions are useful when a lib in your package changes --library. Such 1600# These functions are useful when a lib in your package changes ABI SONAME.
1537# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1601# An example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1538# would break packages that link against it. Most people get around this 1602# would break packages that link against it. Most people get around this
1539# by using the portage SLOT mechanism, but that is not always a relevant 1603# by using the portage SLOT mechanism, but that is not always a relevant
1540# solution, so instead you can add the following to your ebuilds: 1604# solution, so instead you can call this from pkg_preinst. See also the
1541# 1605# preserve_old_lib_notify function.
1542# src_install() {
1543# ...
1544# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1545# ...
1546# }
1547#
1548# pkg_postinst() {
1549# ...
1550# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1551# ...
1552# }
1553
1554preserve_old_lib() { 1606preserve_old_lib() {
1555 LIB=$1 1607 if [[ ${EBUILD_PHASE} != "preinst" ]] ; then
1608 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1609 die "Invalid preserve_old_lib() usage"
1610 fi
1611 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1556 1612
1557 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1613 # let portage worry about it
1558 SONAME=`basename ${LIB}` 1614 has preserve-libs ${FEATURES} && return 0
1559 DIRNAME=`dirname ${LIB}`
1560 1615
1561 dodir ${DIRNAME} 1616 local lib dir
1562 cp ${ROOT}${LIB} ${D}${DIRNAME} 1617 for lib in "$@" ; do
1618 [[ -e ${ROOT}/${lib} ]] || continue
1619 dir=${lib%/*}
1620 dodir ${dir} || die "dodir ${dir} failed"
1621 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
1563 touch ${D}${LIB} 1622 touch "${D}"/${lib}
1564 fi 1623 done
1565} 1624}
1566 1625
1626# @FUNCTION: preserve_old_lib_notify
1627# @USAGE: <libs to notify> [more libs]
1628# @DESCRIPTION:
1629# Spit helpful messages about the libraries preserved by preserve_old_lib.
1567preserve_old_lib_notify() { 1630preserve_old_lib_notify() {
1568 LIB=$1 1631 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1632 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1633 die "Invalid preserve_old_lib_notify() usage"
1634 fi
1569 1635
1570 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1636 # let portage worry about it
1571 SONAME=`basename ${LIB}` 1637 has preserve-libs ${FEATURES} && return 0
1572 1638
1639 local lib notice=0
1640 for lib in "$@" ; do
1641 [[ -e ${ROOT}/${lib} ]] || continue
1642 if [[ ${notice} -eq 0 ]] ; then
1643 notice=1
1573 ewarn "An old version of an installed library was detected on your system." 1644 ewarn "Old versions of installed libraries were detected on your system."
1574 ewarn "In order to avoid breaking packages that link against it, this older version" 1645 ewarn "In order to avoid breaking packages that depend on these old libs,"
1575 ewarn "is not being removed. In order to make full use of this newer version," 1646 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1576 ewarn "you will need to execute the following command:" 1647 ewarn "in order to remove these old dependencies. If you do not have this"
1648 ewarn "helper program, simply emerge the 'gentoolkit' package."
1649 ewarn
1650 fi
1577 ewarn " revdep-rebuild --library ${SONAME}" 1651 ewarn " # revdep-rebuild --library ${lib##*/}"
1652 done
1653 if [[ ${notice} -eq 1 ]] ; then
1578 ewarn 1654 ewarn
1579 ewarn "After doing that, you can safely remove ${LIB}" 1655 ewarn "Once you've finished running revdep-rebuild, it should be safe to"
1580 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild" 1656 ewarn "delete the old libraries. Here is a copy & paste for the lazy:"
1657 for lib in "$@" ; do
1658 ewarn " # rm '${lib}'"
1659 done
1581 fi 1660 fi
1582} 1661}
1583 1662
1584# Hack for people to figure out if a package was built with 1663# @FUNCTION: built_with_use
1585# certain USE flags 1664# @USAGE: [--hidden] [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1665# @DESCRIPTION:
1666# A temporary hack until portage properly supports DEPENDing on USE
1667# flags being enabled in packages. This will check to see if the specified
1668# DEPEND atom was built with the specified list of USE flags. The
1669# --missing option controls the behavior if called on a package that does
1670# not actually support the defined USE flags (aka listed in IUSE).
1671# The default is to abort (call die). The -a and -o flags control
1672# the requirements of the USE flags. They correspond to "and" and "or"
1673# logic. So the -a flag means all listed USE flags must be enabled
1674# while the -o flag means at least one of the listed IUSE flags must be
1675# enabled. The --hidden option is really for internal use only as it
1676# means the USE flag we're checking is hidden expanded, so it won't be found
1677# in IUSE like normal USE flags.
1586# 1678#
1587# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1679# Remember that this function isn't terribly intelligent so order of optional
1588# ex: built_with_use xchat gtk2 1680# flags matter.
1589#
1590# Flags: -a all USE flags should be utilized
1591# -o at least one USE flag should be utilized
1592# Note: the default flag is '-a'
1593built_with_use() { 1681built_with_use() {
1682 local hidden="no"
1683 if [[ $1 == "--hidden" ]] ; then
1684 hidden="yes"
1685 shift
1686 fi
1687
1688 local missing_action="die"
1689 if [[ $1 == "--missing" ]] ; then
1690 missing_action=$2
1691 shift ; shift
1692 case ${missing_action} in
1693 true|false|die) ;;
1694 *) die "unknown action '${missing_action}'";;
1695 esac
1696 fi
1697
1594 local opt=$1 1698 local opt=$1
1595 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1699 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1596 1700
1597 local PKG=$(best_version $1) 1701 local PKG=$(best_version $1)
1598 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package" 1702 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1599 shift 1703 shift
1600 1704
1601 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE 1705 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1602 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE 1706 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1603 1707
1604 # if the USE file doesnt exist, assume the $PKG is either 1708 # if the IUSE file doesn't exist, the read will error out, we need to handle
1605 # injected or package.provided 1709 # this gracefully
1710 if [[ ! -e ${USEFILE} ]] || [[ ! -e ${IUSEFILE} && ${hidden} == "no" ]] ; then
1711 case ${missing_action} in
1712 true) return 0;;
1713 false) return 1;;
1606 [[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with" 1714 die) die "Unable to determine what USE flags $PKG was built with";;
1715 esac
1716 fi
1607 1717
1718 if [[ ${hidden} == "no" ]] ; then
1608 local IUSE_BUILT=$(<${IUSEFILE}) 1719 local IUSE_BUILT=( $(<"${IUSEFILE}") )
1609 # Don't check USE_EXPAND #147237 1720 # Don't check USE_EXPAND #147237
1610 local expand 1721 local expand
1611 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do 1722 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1612 if [[ $1 == ${expand}_* ]] ; then 1723 if [[ $1 == ${expand}_* ]] ; then
1613 expand="" 1724 expand=""
1614 break 1725 break
1615 fi 1726 fi
1616 done 1727 done
1617 if [[ -n ${expand} ]] ; then 1728 if [[ -n ${expand} ]] ; then
1729 if ! has $1 ${IUSE_BUILT[@]#[-+]} ; then
1730 case ${missing_action} in
1731 true) return 0;;
1732 false) return 1;;
1618 has $1 ${IUSE_BUILT} || die "$PKG does not actually support the $1 USE flag!" 1733 die) die "$PKG does not actually support the $1 USE flag!";;
1734 esac
1735 fi
1736 fi
1619 fi 1737 fi
1620 1738
1621 local USE_BUILT=$(<${USEFILE}) 1739 local USE_BUILT=$(<${USEFILE})
1622 while [[ $# -gt 0 ]] ; do 1740 while [[ $# -gt 0 ]] ; do
1623 if [[ ${opt} = "-o" ]] ; then 1741 if [[ ${opt} = "-o" ]] ; then
1628 shift 1746 shift
1629 done 1747 done
1630 [[ ${opt} = "-a" ]] 1748 [[ ${opt} = "-a" ]]
1631} 1749}
1632 1750
1751# @FUNCTION: epunt_cxx
1752# @USAGE: [dir to scan]
1753# @DESCRIPTION:
1633# Many configure scripts wrongly bail when a C++ compiler 1754# Many configure scripts wrongly bail when a C++ compiler could not be
1634# could not be detected. #73450 1755# detected. If dir is not specified, then it defaults to ${S}.
1756#
1757# http://bugs.gentoo.org/73450
1635epunt_cxx() { 1758epunt_cxx() {
1636 local dir=$1 1759 local dir=$1
1637 [[ -z ${dir} ]] && dir=${S} 1760 [[ -z ${dir} ]] && dir=${S}
1638 ebegin "Removing useless C++ checks" 1761 ebegin "Removing useless C++ checks"
1639 local f 1762 local f
1640 for f in $(find ${dir} -name configure) ; do 1763 find "${dir}" -name configure | while read f ; do
1641 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1764 patch --no-backup-if-mismatch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1642 done 1765 done
1643 eend 0 1766 eend 0
1644} 1767}
1645 1768
1646# dopamd <file> [more files] 1769# @FUNCTION: make_wrapper
1647# 1770# @USAGE: <wrapper> <target> [chdir] [libpaths] [installpath]
1648# Install pam auth config file in /etc/pam.d 1771# @DESCRIPTION:
1649dopamd() { 1772# Create a shell wrapper script named wrapper in installpath
1650 [[ -z $1 ]] && die "dopamd requires at least one argument" 1773# (defaults to the bindir) to execute target (default of wrapper) by
1651 1774# first optionally setting LD_LIBRARY_PATH to the colon-delimited
1652 use pam || return 0 1775# libpaths followed by optionally changing directory to chdir.
1653
1654 INSDESTTREE=/etc/pam.d \
1655 doins "$@" || die "failed to install $@"
1656}
1657# newpamd <old name> <new name>
1658#
1659# Install pam file <old name> as <new name> in /etc/pam.d
1660newpamd() {
1661 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1662
1663 use pam || return 0
1664
1665 INSDESTTREE=/etc/pam.d \
1666 newins "$1" "$2" || die "failed to install $1 as $2"
1667}
1668
1669# make a wrapper script ...
1670# NOTE: this was originally games_make_wrapper, but I noticed other places where
1671# this could be used, so I have moved it here and made it not games-specific
1672# -- wolf31o2
1673# $1 == wrapper name
1674# $2 == binary to run
1675# $3 == directory to chdir before running binary
1676# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1677# $5 == path for wrapper
1678make_wrapper() { 1776make_wrapper() {
1679 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1777 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1680 local tmpwrapper=$(emktemp) 1778 local tmpwrapper=$(emktemp)
1681 # We don't want to quote ${bin} so that people can pass complex 1779 # We don't want to quote ${bin} so that people can pass complex
1682 # things as $bin ... "./someprog --args" 1780 # things as $bin ... "./someprog --args"
1692fi 1790fi
1693exec ${bin} "\$@" 1791exec ${bin} "\$@"
1694EOF 1792EOF
1695 chmod go+rx "${tmpwrapper}" 1793 chmod go+rx "${tmpwrapper}"
1696 if [[ -n ${path} ]] ; then 1794 if [[ -n ${path} ]] ; then
1795 (
1697 exeinto "${path}" 1796 exeinto "${path}"
1698 newexe "${tmpwrapper}" "${wrapper}" 1797 newexe "${tmpwrapper}" "${wrapper}"
1798 ) || die
1699 else 1799 else
1700 newbin "${tmpwrapper}" "${wrapper}" 1800 newbin "${tmpwrapper}" "${wrapper}" || die
1701 fi 1801 fi
1702} 1802}

Legend:
Removed from v.1.256  
changed lines
  Added in v.1.303

  ViewVC Help
Powered by ViewVC 1.1.20