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

Diff of /eclass/eutils.eclass

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

Revision 1.185 Revision 1.275
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2006 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.185 2005/07/04 20:32:22 azarah Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.275 2007/02/17 00:17:39 vapier Exp $
4#
5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 4#
7# This eclass is for general purpose functions that most ebuilds 5# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 6# have to implement themselves.
9# 7#
10# NB: If you add anything, please comment it! 8# NB: If you add anything, please comment it!
9#
10# Maintainer: see each individual function, base-system@gentoo.org as default
11 11
12inherit multilib 12inherit multilib portability
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15
16DEPEND="!bootstrap? ( sys-devel/patch )"
17# sys-apps/shadow is needed for useradd, etc, bug #94745.
18 13
19DESCRIPTION="Based on the ${ECLASS} eclass" 14DESCRIPTION="Based on the ${ECLASS} eclass"
20 15
21# Wait for the supplied number of seconds. If no argument is supplied, defaults 16# Wait for the supplied number of seconds. If no argument is supplied, defaults
22# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 17# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
23# outputting to a terminal, don't wait. For compatability purposes, the argument 18# outputting to a terminal, don't wait. For compatability purposes, the argument
24# must be an integer greater than zero. 19# must be an integer greater than zero.
25# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
26epause() { 21epause() {
27 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then 22 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
28 sleep ${1:-5}
29 fi
30} 23}
31 24
32# Beep the specified number of times (defaults to five). If our output 25# Beep the specified number of times (defaults to five). If our output
33# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set, 26# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set,
34# don't beep. 27# don't beep.
35# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 28# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
36ebeep() { 29ebeep() {
37 local n 30 local n
38 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then 31 if [[ -z ${EBEEP_IGNORE} ]] ; then
39 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 32 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
40 echo -ne "\a" 33 echo -ne "\a"
41 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null 34 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
42 echo -ne "\a" 35 echo -ne "\a"
43 sleep 1 36 sleep 1
44 done 37 done
45 fi 38 fi
46} 39}
47 40
48# This function generate linker scripts in /usr/lib for dynamic 41# This function generate linker scripts in /usr/lib for dynamic
49# libs in /lib. This is to fix linking problems when you have 42# libs in /lib. This is to fix linking problems when you have
50# the .so in /lib, and the .a in /usr/lib. What happens is that 43# the .so in /lib, and the .a in /usr/lib. What happens is that
51# in some cases when linking dynamic, the .a in /usr/lib is used 44# in some cases when linking dynamic, the .a in /usr/lib is used
52# instead of the .so in /lib due to gcc/libtool tweaking ld's 45# instead of the .so in /lib due to gcc/libtool tweaking ld's
53# library search path. This cause many builds to fail. 46# library search path. This cause many builds to fail.
54# See bug #4411 for more info. 47# See bug #4411 for more info.
55# 48#
56# To use, simply call: 49# To use, simply call:
57# 50#
58# gen_usr_ldscript libfoo.so 51# gen_usr_ldscript libfoo.so
59# 52#
60# Note that you should in general use the unversioned name of 53# Note that you should in general use the unversioned name of
61# the library, as ldconfig should usually update it correctly 54# the library, as ldconfig should usually update it correctly
62# to point to the latest version of the library present. 55# to point to the latest version of the library present.
63# 56#
64# <azarah@gentoo.org> (26 Oct 2002) 57# <azarah@gentoo.org> (26 Oct 2002)
65# 58#
66gen_usr_ldscript() { 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
67 local libdir="$(get_libdir)" 68 local lib libdir=$(get_libdir)
68 # Just make sure it exists 69 # Just make sure it exists
69 dodir /usr/${libdir} 70 dodir /usr/${libdir}
70 71
71 for lib in "${@}" ; do 72 for lib in "${@}" ; do
72 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 73 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
73 /* GNU ld script 74 /* GNU ld script
74 Since Gentoo has critical dynamic libraries 75 Since Gentoo has critical dynamic libraries
75 in /lib, and the static versions in /usr/lib, 76 in /lib, and the static versions in /usr/lib,
76 we need to have a "fake" dynamic lib in /usr/lib, 77 we need to have a "fake" dynamic lib in /usr/lib,
77 otherwise we run into linking problems. 78 otherwise we run into linking problems.
78 79
79 See bug http://bugs.gentoo.org/4411 for more info. 80 See bug http://bugs.gentoo.org/4411 for more info.
80 */ 81 */
81 GROUP ( /${libdir}/${lib} ) 82 GROUP ( /${libdir}/${lib} )
82 END_LDSCRIPT 83 END_LDSCRIPT
83 fperms a+x "/usr/${libdir}/${lib}" 84 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
84 done 85 done
85} 86}
86 87
87# Simple function to draw a line consisting of '=' the same length as $*
88# - only to be used by epatch()
89#
90# <azarah@gentoo.org> (11 Nov 2002)
91#
92draw_line() {
93 local i=0
94 local str_length=""
95
96 # Handle calls that do not have args, or wc not being installed ...
97 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
98 then
99 echo "==============================================================="
100 return 0
101 fi
102
103 # Get the length of $*
104 str_length="$(echo -n "$*" | wc -m)"
105
106 while [ "$i" -lt "${str_length}" ]
107 do
108 echo -n "="
109
110 i=$((i + 1))
111 done
112
113 echo
114
115 return 0
116}
117 88
118# Default directory where patches are located 89# Default directory where patches are located
119EPATCH_SOURCE="${WORKDIR}/patch" 90EPATCH_SOURCE="${WORKDIR}/patch"
120# Default extension for patches 91# Default extension for patches
121EPATCH_SUFFIX="patch.bz2" 92EPATCH_SUFFIX="patch.bz2"
122# Default options for patch 93# Default options for patch
123# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 94# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
124# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 95# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
96# Set -E to automatically remove empty files.
125EPATCH_OPTS="-g0 --no-backup-if-mismatch" 97EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
126# List of patches not to apply. Not this is only file names, 98# List of patches not to apply. Not this is only file names,
127# and not the full path .. 99# and not the full path ..
128EPATCH_EXCLUDE="" 100EPATCH_EXCLUDE=""
129# Change the printed message for a single patch. 101# Change the printed message for a single patch.
130EPATCH_SINGLE_MSG="" 102EPATCH_SINGLE_MSG=""
131# Change the printed message for multiple patches. 103# Change the printed message for multiple patches.
132EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 104EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
133# Force applying bulk patches even if not following the style: 105# Force applying bulk patches even if not following the style:
134# 106#
135# ??_${ARCH}_foo.${EPATCH_SUFFIX} 107# ??_${ARCH}_foo.${EPATCH_SUFFIX}
136# 108#
137EPATCH_FORCE="no" 109EPATCH_FORCE="no"
138 110
139# This function is for bulk patching, or in theory for just one 111# This function is for bulk patching, or in theory for just one
140# or two patches. 112# or two patches.
151# 123#
152# Patches are applied in current directory. 124# Patches are applied in current directory.
153# 125#
154# Bulk Patches should preferibly have the form of: 126# Bulk Patches should preferibly have the form of:
155# 127#
156# ??_${ARCH}_foo.${EPATCH_SUFFIX} 128# ??_${ARCH}_foo.${EPATCH_SUFFIX}
157# 129#
158# For example: 130# For example:
159# 131#
160# 01_all_misc-fix.patch.bz2 132# 01_all_misc-fix.patch.bz2
161# 02_sparc_another-fix.patch.bz2 133# 02_sparc_another-fix.patch.bz2
162# 134#
163# This ensures that there are a set order, and you can have ARCH 135# This ensures that there are a set order, and you can have ARCH
164# specific patches. 136# specific patches.
165# 137#
166# If you however give an argument to epatch(), it will treat it as a 138# If you however give an argument to epatch(), it will treat it as a
168# hand its a directory, it will set EPATCH_SOURCE to this. 140# hand its a directory, it will set EPATCH_SOURCE to this.
169# 141#
170# <azarah@gentoo.org> (10 Nov 2002) 142# <azarah@gentoo.org> (10 Nov 2002)
171# 143#
172epatch() { 144epatch() {
145 _epatch_draw_line() {
146 [[ -z $1 ]] && set "$(printf "%65s" '')"
147 echo "${1//?/=}"
148 }
149 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
173 local PIPE_CMD="" 150 local PIPE_CMD=""
174 local STDERR_TARGET="${T}/$$.out" 151 local STDERR_TARGET="${T}/$$.out"
175 local PATCH_TARGET="${T}/$$.patch" 152 local PATCH_TARGET="${T}/$$.patch"
176 local PATCH_SUFFIX="" 153 local PATCH_SUFFIX=""
177 local SINGLE_PATCH="no" 154 local SINGLE_PATCH="no"
178 local x="" 155 local x=""
156
157 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
179 158
180 if [ "$#" -gt 1 ] 159 if [ "$#" -gt 1 ]
181 then 160 then
182 local m="" 161 local m=""
183 for m in "$@" ; do 162 for m in "$@" ; do
247 fi 226 fi
248 for x in ${EPATCH_SOURCE} 227 for x in ${EPATCH_SOURCE}
249 do 228 do
250 # New ARCH dependant patch naming scheme ... 229 # New ARCH dependant patch naming scheme ...
251 # 230 #
252 # ???_arch_foo.patch 231 # ???_arch_foo.patch
253 # 232 #
254 if [ -f ${x} ] && \ 233 if [ -f ${x} ] && \
255 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \ 234 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
256 [ "${EPATCH_FORCE}" = "yes" ]) 235 [ "${EPATCH_FORCE}" = "yes" ])
257 then 236 then
258 local count=0 237 local count=0
259 local popts="${EPATCH_OPTS}" 238 local popts="${EPATCH_OPTS}"
260 local patchname=${x##*/} 239 local patchname=${x##*/}
261 240
284 263
285 # Allow for prefix to differ ... im lazy, so shoot me :/ 264 # Allow for prefix to differ ... im lazy, so shoot me :/
286 while [ "${count}" -lt 5 ] 265 while [ "${count}" -lt 5 ]
287 do 266 do
288 # Generate some useful debug info ... 267 # Generate some useful debug info ...
289 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 268 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
291 270
292 if [ "${PATCH_SUFFIX}" != "patch" ] 271 if [ "${PATCH_SUFFIX}" != "patch" ]
293 then 272 then
294 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 273 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
295 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 274 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
296 else 275 else
297 PATCH_TARGET="${x}" 276 PATCH_TARGET="${x}"
298 fi 277 fi
299 278
300 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 280 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 281
303 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
304 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
305 284
306 if [ "${PATCH_SUFFIX}" != "patch" ] 285 if [ "${PATCH_SUFFIX}" != "patch" ]
307 then 286 then
308 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 287 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
309 then 288 then
313 count=5 292 count=5
314 break 293 break
315 fi 294 fi
316 fi 295 fi
317 296
318 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 297 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
319 then 298 then
320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 299 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 301 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 303 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
325 304
326 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 305 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
306 _epatch_assert
327 307
328 if [ "$?" -ne 0 ] 308 if [ "$?" -ne 0 ]
329 then 309 then
330 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 310 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
331 echo 311 echo
377# vapier@gentoo.org 357# vapier@gentoo.org
378# 358#
379# Takes just 1 optional parameter (the directory to create tmpfile in) 359# Takes just 1 optional parameter (the directory to create tmpfile in)
380emktemp() { 360emktemp() {
381 local exe="touch" 361 local exe="touch"
382 [ "$1" == "-d" ] && exe="mkdir" && shift 362 [[ $1 == -d ]] && exe="mkdir" && shift
383 local topdir="$1" 363 local topdir=$1
384 364
385 if [ -z "${topdir}" ] 365 if [[ -z ${topdir} ]] ; then
386 then
387 [ -z "${T}" ] \ 366 [[ -z ${T} ]] \
388 && topdir="/tmp" \ 367 && topdir="/tmp" \
389 || topdir="${T}" 368 || topdir=${T}
390 fi 369 fi
391 370
392 if [ -z "$(type -p mktemp)" ] 371 if [[ -z $(type -p mktemp) ]] ; then
393 then
394 local tmp=/ 372 local tmp=/
395 while [ -e "${tmp}" ] ; do 373 while [[ -e ${tmp} ]] ; do
396 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 374 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
397 done 375 done
398 ${exe} "${tmp}" 376 ${exe} "${tmp}" || ${exe} -p "${tmp}"
399 echo "${tmp}" 377 echo "${tmp}"
400 else 378 else
401 [ "${exe}" == "touch" ] \ 379 if [[ ${exe} == "touch" ]] ; then
402 && exe="-p" \ 380 [[ ${USERLAND} == "GNU" ]] \
403 || exe="-d" 381 && mktemp -p "${topdir}" \
404 mktemp ${exe} "${topdir}" 382 || TMPDIR="${topdir}" mktemp -t tmp
383 else
384 [[ ${USERLAND} == "GNU" ]] \
385 && mktemp -d "${topdir}" \
386 || TMPDIR="${topdir}" mktemp -dt tmp
387 fi
405 fi 388 fi
406} 389}
407 390
408# Small wrapper for getent (Linux), nidump (Mac OS X), 391# Small wrapper for getent (Linux), nidump (Mac OS X),
409# and pw (FreeBSD) used in enewuser()/enewgroup() 392# and pw (FreeBSD) used in enewuser()/enewgroup()
410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 393# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 394# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
412# 395#
413# egetent(database, key) 396# egetent(database, key)
414egetent() { 397egetent() {
415 if [[ "${USERLAND}" == "Darwin" ]] ; then 398 case ${CHOST} in
399 *-darwin*)
416 case "$2" in 400 case "$2" in
417 *[!0-9]*) # Non numeric 401 *[!0-9]*) # Non numeric
418 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 402 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
419 ;; 403 ;;
420 *) # Numeric 404 *) # Numeric
421 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 405 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
422 ;; 406 ;;
423 esac 407 esac
424 elif [[ "${USERLAND}" == "BSD" ]] ; then 408 ;;
425 local action 409 *-freebsd*|*-dragonfly*)
426 if [ "$1" == "passwd" ] 410 local opts action="user"
427 then 411 [[ $1 == "passwd" ]] || action="group"
428 action="user" 412
429 else 413 # lookup by uid/gid
430 action="group" 414 if [[ $2 == [[:digit:]]* ]] ; then
415 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
431 fi 416 fi
417
432 pw show "${action}" "$2" -q 418 pw show ${action} ${opts} "$2" -q
433 else 419 ;;
420 *-netbsd*|*-openbsd*)
421 grep "$2:\*:" /etc/$1
422 ;;
423 *)
434 which nscd >& /dev/null && nscd -i "$1" 424 type -p nscd >& /dev/null && nscd -i "$1"
435 getent "$1" "$2" 425 getent "$1" "$2"
436 fi 426 ;;
427 esac
437} 428}
438 429
439# Simplify/standardize adding users to the system 430# Simplify/standardize adding users to the system
440# vapier@gentoo.org 431# vapier@gentoo.org
441# 432#
448# shell: /bin/false 439# shell: /bin/false
449# homedir: /dev/null 440# homedir: /dev/null
450# groups: none 441# groups: none
451# extra: comment of 'added by portage for ${PN}' 442# extra: comment of 'added by portage for ${PN}'
452enewuser() { 443enewuser() {
444 case ${EBUILD_PHASE} in
445 unpack|compile|test|install)
446 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."
448 die "Bad package! enewuser is only for use in pkg_* functions!"
449 esac
450
453 # get the username 451 # get the username
454 local euser=$1; shift 452 local euser=$1; shift
455 if [[ -z ${euser} ]] ; then 453 if [[ -z ${euser} ]] ; then
456 eerror "No username specified !" 454 eerror "No username specified !"
457 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
458 fi 456 fi
459 457
460 # lets see if the username already exists 458 # lets see if the username already exists
461 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then 459 if [[ -n $(egetent passwd "${euser}") ]] ; then
462 return 0 460 return 0
463 fi 461 fi
464 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
465 463
466 # options to pass to useradd 464 # options to pass to useradd
467 local opts= 465 local opts=
468 466
469 # handle uid 467 # handle uid
470 local euid=$1; shift 468 local euid=$1; shift
471 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then 469 if [[ -n ${euid} && ${euid} != -1 ]] ; then
472 if [[ ${euid} -gt 0 ]] ; then 470 if [[ ${euid} -gt 0 ]] ; then
473 if [[ ! -z $(egetent passwd ${euid}) ]] ; then 471 if [[ -n $(egetent passwd ${euid}) ]] ; then
474 euid="next" 472 euid="next"
475 fi 473 fi
476 else 474 else
477 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
478 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
479 fi 477 fi
480 else 478 else
481 euid="next" 479 euid="next"
482 fi 480 fi
483 if [[ ${euid} == "next" ]] ; then 481 if [[ ${euid} == "next" ]] ; then
484 local pwrange 482 for ((euid = 101; euid <= 999; euid++)); 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 483 [[ -z $(egetent passwd ${euid}) ]] && break
492 done 484 done
493 fi 485 fi
494 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
495 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
496 488
497 # handle shell 489 # handle shell
498 local eshell=$1; shift 490 local eshell=$1; shift
499 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
500 if [[ ! -e ${eshell} ]] ; then 492 if [[ ! -e ${ROOT}${eshell} ]] ; then
501 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
502 die "${eshell} does not exist" 494 die "${eshell} does not exist in ${ROOT}"
495 fi
496 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
497 eerror "Do not specify ${eshell} yourself, use -1"
498 die "Pass '-1' as the shell parameter"
503 fi 499 fi
504 else 500 else
501 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
502 [[ -x ${ROOT}${shell} ]] && break
503 done
504
505 if [[ ${shell} == "/dev/null" ]] ; then
506 eerror "Unable to identify the shell to use, proceeding with userland default."
505 case ${USERLAND} in 507 case ${USERLAND} in
506 Darwin) eshell="/usr/bin/false";; 508 GNU) shell="/bin/false" ;;
507 BSD) eshell="/usr/sbin/nologin";; 509 BSD) shell="/sbin/nologin" ;;
508 *) eshell="/bin/false";; 510 Darwin) shell="/usr/sbin/nologin" ;;
511 *) die "Unable to identify the default shell for userland ${USERLAND}"
509 esac 512 esac
513 fi
514
515 eshell=${shell}
510 fi 516 fi
511 einfo " - Shell: ${eshell}" 517 einfo " - Shell: ${eshell}"
512 opts="${opts} -s ${eshell}" 518 opts="${opts} -s ${eshell}"
513 519
514 # handle homedir 520 # handle homedir
551 einfo " - Groups: ${egroups}" 557 einfo " - Groups: ${egroups}"
552 558
553 # handle extra and add the user 559 # handle extra and add the user
554 local oldsandbox=${SANDBOX_ON} 560 local oldsandbox=${SANDBOX_ON}
555 export SANDBOX_ON="0" 561 export SANDBOX_ON="0"
556 case ${USERLAND} in 562 case ${CHOST} in
557 Darwin) 563 *-darwin*)
558 ### Make the user 564 ### Make the user
559 if [[ -z $@ ]] ; then 565 if [[ -z $@ ]] ; then
560 dscl . create /users/${euser} uid ${euid} 566 dscl . create /users/${euser} uid ${euid}
561 dscl . create /users/${euser} shell ${eshell} 567 dscl . create /users/${euser} shell ${eshell}
562 dscl . create /users/${euser} home ${ehome} 568 dscl . create /users/${euser} home ${ehome}
573 einfo "Please report the ebuild along with the info below" 579 einfo "Please report the ebuild along with the info below"
574 einfo "eextra: $@" 580 einfo "eextra: $@"
575 die "Required function missing" 581 die "Required function missing"
576 fi 582 fi
577 ;; 583 ;;
578 BSD) 584 *-freebsd*|*-dragonfly*)
579 if [[ -z $@ ]] ; then 585 if [[ -z $@ ]] ; then
580 pw useradd ${euser} ${opts} \ 586 pw useradd ${euser} ${opts} \
581 -c "added by portage for ${PN}" \ 587 -c "added by portage for ${PN}" \
582 die "enewuser failed" 588 die "enewuser failed"
583 else 589 else
584 einfo " - Extra: $@" 590 einfo " - Extra: $@"
585 pw useradd ${euser} ${opts} \ 591 pw useradd ${euser} ${opts} \
586 "$@" || die "enewuser failed" 592 "$@" || die "enewuser failed"
587 fi 593 fi
588 ;; 594 ;;
595
596 *-netbsd*)
597 if [[ -z $@ ]] ; then
598 useradd ${opts} ${euser} || die "enewuser failed"
599 else
600 einfo " - Extra: $@"
601 useradd ${opts} ${euser} "$@" || die "enewuser failed"
602 fi
603 ;;
604
605 *-openbsd*)
606 if [[ -z $@ ]] ; then
607 useradd -u ${euid} -s ${eshell} \
608 -d ${ehome} -c "Added by portage for ${PN}" \
609 -g ${egroups} ${euser} || die "enewuser failed"
610 else
611 einfo " - Extra: $@"
612 useradd -u ${euid} -s ${eshell} \
613 -d ${ehome} -c "Added by portage for ${PN}" \
614 -g ${egroups} ${euser} "$@" || die "enewuser failed"
615 fi
616 ;;
617
589 *) 618 *)
590 if [[ -z $@ ]] ; then 619 if [[ -z $@ ]] ; then
591 useradd ${opts} ${euser} \ 620 useradd ${opts} ${euser} \
592 -c "added by portage for ${PN}" \ 621 -c "added by portage for ${PN}" \
593 || die "enewuser failed" 622 || die "enewuser failed"
596 useradd ${opts} ${euser} "$@" \ 625 useradd ${opts} ${euser} "$@" \
597 || die "enewuser failed" 626 || die "enewuser failed"
598 fi 627 fi
599 ;; 628 ;;
600 esac 629 esac
630
631 if [[ ! -e ${ROOT}/${ehome} ]] ; then
632 einfo " - Creating ${ehome} in ${ROOT}"
633 mkdir -p "${ROOT}/${ehome}"
634 chown ${euser} "${ROOT}/${ehome}"
635 chmod 755 "${ROOT}/${ehome}"
636 fi
637
601 export SANDBOX_ON=${oldsandbox} 638 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} 639}
611 640
612# Simplify/standardize adding groups to the system 641# Simplify/standardize adding groups to the system
613# vapier@gentoo.org 642# vapier@gentoo.org
614# 643#
617# Default values if you do not specify any: 646# Default values if you do not specify any:
618# groupname: REQUIRED ! 647# groupname: REQUIRED !
619# gid: next available (see groupadd(8)) 648# gid: next available (see groupadd(8))
620# extra: none 649# extra: none
621enewgroup() { 650enewgroup() {
651 case ${EBUILD_PHASE} in
652 unpack|compile|test|install)
653 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."
655 die "Bad package! enewgroup is only for use in pkg_* functions!"
656 esac
657
622 # get the group 658 # get the group
623 local egroup="$1"; shift 659 local egroup="$1"; shift
624 if [ -z "${egroup}" ] 660 if [ -z "${egroup}" ]
625 then 661 then
626 eerror "No group specified !" 662 eerror "No group specified !"
627 die "Cannot call enewgroup without a group" 663 die "Cannot call enewgroup without a group"
628 fi 664 fi
629 665
630 # see if group already exists 666 # see if group already exists
631 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 667 if [[ -n $(egetent group "${egroup}") ]]; then
632 then
633 return 0 668 return 0
634 fi 669 fi
635 einfo "Adding group '${egroup}' to your system ..." 670 einfo "Adding group '${egroup}' to your system ..."
636 671
637 # options to pass to useradd 672 # options to pass to useradd
643 then 678 then
644 if [ "${egid}" -gt 0 ] 679 if [ "${egid}" -gt 0 ]
645 then 680 then
646 if [ -z "`egetent group ${egid}`" ] 681 if [ -z "`egetent group ${egid}`" ]
647 then 682 then
648 if [[ "${USERLAND}" == "Darwin" ]]; then 683 if [[ "${CHOST}" == *-darwin* ]]; then
649 opts="${opts} ${egid}" 684 opts="${opts} ${egid}"
650 else 685 else
651 opts="${opts} -g ${egid}" 686 opts="${opts} -g ${egid}"
652 fi 687 fi
653 else 688 else
667 opts="${opts} ${eextra}" 702 opts="${opts} ${eextra}"
668 703
669 # add the group 704 # add the group
670 local oldsandbox="${SANDBOX_ON}" 705 local oldsandbox="${SANDBOX_ON}"
671 export SANDBOX_ON="0" 706 export SANDBOX_ON="0"
672 if [[ "${USERLAND}" == "Darwin" ]]; then 707 case ${CHOST} in
708 *-darwin*)
673 if [ ! -z "${eextra}" ]; 709 if [ ! -z "${eextra}" ];
674 then 710 then
675 einfo "Extra options are not supported on Darwin/OS X yet" 711 einfo "Extra options are not supported on Darwin/OS X yet"
676 einfo "Please report the ebuild along with the info below" 712 einfo "Please report the ebuild along with the info below"
677 einfo "eextra: ${eextra}" 713 einfo "eextra: ${eextra}"
678 die "Required function missing" 714 die "Required function missing"
679 fi 715 fi
680 716
681 # If we need the next available 717 # If we need the next available
682 case ${egid} in 718 case ${egid} in
683 *[!0-9]*) # Non numeric 719 *[!0-9]*) # Non numeric
684 for egid in `jot 898 101`; do 720 for ((egid = 101; egid <= 999; egid++)); do
685 [ -z "`egetent group ${egid}`" ] && break 721 [[ -z $(egetent group ${egid}) ]] && break
686 done 722 done
687 esac 723 esac
688 dscl . create /groups/${egroup} gid ${egid} 724 dscl . create /groups/${egroup} gid ${egid}
689 dscl . create /groups/${egroup} passwd '*' 725 dscl . create /groups/${egroup} passwd '*'
690 elif [[ "${USERLAND}" == "BSD" ]] ; then 726 ;;
727
728 *-freebsd*|*-dragonfly*)
691 case ${egid} in 729 case ${egid} in
692 *[!0-9]*) # Non numeric 730 *[!0-9]*) # Non numeric
693 for egid in `jot 898 101`; do 731 for ((egid = 101; egid <= 999; egid++)); do
694 [ -z "`egetent group ${egid}`" ] && break 732 [[ -z $(egetent group ${egid}) ]] && break
695 done 733 done
696 esac 734 esac
697 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 735 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
698 else 736 ;;
737
738 *-netbsd*)
739 case ${egid} in
740 *[!0-9]*) # Non numeric
741 for ((egid = 101; egid <= 999; egid++)); do
742 [[ -z $(egetent group ${egid}) ]] && break
743 done
744 esac
745 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
746 ;;
747
748 *)
699 groupadd ${opts} ${egroup} || die "enewgroup failed" 749 groupadd ${opts} ${egroup} || die "enewgroup failed"
700 fi 750 ;;
751 esac
701 export SANDBOX_ON="${oldsandbox}" 752 export SANDBOX_ON="${oldsandbox}"
702} 753}
703 754
704# Simple script to replace 'dos2unix' binaries 755# Simple script to replace 'dos2unix' binaries
705# vapier@gentoo.org 756# vapier@gentoo.org
706# 757#
707# edos2unix(file, <more files> ...) 758# edos2unix(file, <more files> ...)
708edos2unix() { 759edos2unix() {
709 for f in "$@" 760 echo "$@" | xargs sed -i 's/\r$//'
710 do
711 cp "${f}" ${T}/edos2unix
712 sed 's/\r$//' ${T}/edos2unix > "${f}"
713 done
714} 761}
715 762
716 763
717############################################################## 764##############################################################
718# START: Handle .desktop files and menu entries # 765# START: Handle .desktop files and menu entries #
719# maybe this should be separated into a new eclass some time # 766# maybe this should be separated into a new eclass some time #
720# lanius@gentoo.org # 767# lanius@gentoo.org #
721############################################################## 768##############################################################
722 769
723# Make a desktop file ! 770# Make a desktop file !
724# Great for making those icons in kde/gnome startmenu ! 771# Great for making those icons in kde/gnome startmenu !
725# Amaze your friends ! Get the women ! Join today ! 772# Amaze your friends ! Get the women ! Join today !
726# 773#
727# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 774# make_desktop_entry(<command>, [name], [icon], [type], [path])
728# 775#
729# binary: what binary does the app run with ? 776# binary: what command does the app run with ?
730# name: the name that will show up in the menu 777# name: the name that will show up in the menu
731# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
732# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
733# a full path to an icon 780# a full path to an icon
734# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
735# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 782# http://www.freedesktop.org/Standards/desktop-entry-spec
736# path: if your app needs to startup in a specific dir 783# path: if your app needs to startup in a specific dir
737make_desktop_entry() { 784make_desktop_entry() {
738 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 785 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
739 786
740 local exec=${1} 787 local exec=${1}
747 local catmaj=${CATEGORY%%-*} 794 local catmaj=${CATEGORY%%-*}
748 local catmin=${CATEGORY##*-} 795 local catmin=${CATEGORY##*-}
749 case ${catmaj} in 796 case ${catmaj} in
750 app) 797 app)
751 case ${catmin} in 798 case ${catmin} in
752 admin) type=System;; 799 admin) type=System;;
753 cdr) type=DiscBurning;; 800 cdr) type=DiscBurning;;
754 dicts) type=Dictionary;; 801 dicts) type=Dictionary;;
755 editors) type=TextEditor;; 802 editors) type=TextEditor;;
756 emacs) type=TextEditor;; 803 emacs) type=TextEditor;;
757 emulation) type=Emulator;; 804 emulation) type=Emulator;;
758 laptop) type=HardwareSettings;; 805 laptop) type=HardwareSettings;;
759 office) type=Office;; 806 office) type=Office;;
760 vim) type=TextEditor;; 807 vim) type=TextEditor;;
761 xemacs) type=TextEditor;; 808 xemacs) type=TextEditor;;
762 *) type=;; 809 *) type=;;
763 esac 810 esac
764 ;; 811 ;;
765 812
766 dev) 813 dev)
767 type="Development" 814 type="Development"
768 ;; 815 ;;
769 816
770 games) 817 games)
771 [[ -z ${path} ]] && path=${GAMES_BINDIR}
772
773 case ${catmin} in 818 case ${catmin} in
774 action) type=ActionGame;; 819 action|fps) type=ActionGame;;
775 arcade) type=ArcadeGame;; 820 arcade) type=ArcadeGame;;
776 board) type=BoardGame;; 821 board) type=BoardGame;;
777 kid) type=KidsGame;; 822 kids) type=KidsGame;;
778 emulation) type=Emulator;; 823 emulation) type=Emulator;;
779 puzzle) type=LogicGame;; 824 puzzle) type=LogicGame;;
780 rpg) type=RolePlaying;; 825 rpg) type=RolePlaying;;
781 roguelike) type=RolePlaying;; 826 roguelike) type=RolePlaying;;
782 simulation) type=Simulation;; 827 simulation) type=Simulation;;
783 sports) type=SportsGame;; 828 sports) type=SportsGame;;
784 strategy) type=StrategyGame;; 829 strategy) type=StrategyGame;;
785 *) type=;; 830 *) type=;;
786 esac 831 esac
787 type="Game;${type}" 832 type="Game;${type}"
788 ;; 833 ;;
789 834
790 mail) 835 mail)
794 media) 839 media)
795 case ${catmin} in 840 case ${catmin} in
796 gfx) type=Graphics;; 841 gfx) type=Graphics;;
797 radio) type=Tuner;; 842 radio) type=Tuner;;
798 sound) type=Audio;; 843 sound) type=Audio;;
799 tv) type=TV;; 844 tv) type=TV;;
800 video) type=Video;; 845 video) type=Video;;
801 *) type=;; 846 *) type=;;
802 esac 847 esac
803 type="AudioVideo;${type}" 848 type="AudioVideo;${type}"
804 ;; 849 ;;
805 850
806 net) 851 net)
807 case ${catmin} in 852 case ${catmin} in
808 dialup) type=Dialup;; 853 dialup) type=Dialup;;
809 ftp) type=FileTransfer;; 854 ftp) type=FileTransfer;;
810 im) type=InstantMessaging;; 855 im) type=InstantMessaging;;
811 irc) type=IRCClient;; 856 irc) type=IRCClient;;
812 mail) type=Email;; 857 mail) type=Email;;
813 news) type=News;; 858 news) type=News;;
814 nntp) type=News;; 859 nntp) type=News;;
815 p2p) type=FileTransfer;; 860 p2p) type=FileTransfer;;
816 *) type=;; 861 *) type=;;
817 esac 862 esac
818 type="Network;${type}" 863 type="Network;${type}"
819 ;; 864 ;;
820 865
821 sci) 866 sci)
822 case ${catmin} in 867 case ${catmin} in
823 astro*) type=Astronomoy;; 868 astro*) type=Astronomy;;
824 bio*) type=Biology;; 869 bio*) type=Biology;;
825 calc*) type=Calculator;; 870 calc*) type=Calculator;;
826 chem*) type=Chemistry;; 871 chem*) type=Chemistry;;
827 geo*) type=Geology;; 872 geo*) type=Geology;;
828 math*) type=Math;; 873 math*) type=Math;;
829 *) type=;; 874 *) type=;;
830 esac 875 esac
831 type="Science;${type}" 876 type="Science;${type}"
832 ;; 877 ;;
833 878
834 www) 879 www)
835 case ${catmin} in 880 case ${catmin} in
836 client) type=WebBrowser;; 881 client) type=WebBrowser;;
837 *) type=;; 882 *) type=;;
838 esac 883 esac
839 type="Network" 884 type="Network"
840 ;; 885 ;;
841 886
842 *) 887 *)
847 if [ "${SLOT}" == "0" ] ; then 892 if [ "${SLOT}" == "0" ] ; then
848 local desktop_name="${PN}" 893 local desktop_name="${PN}"
849 else 894 else
850 local desktop_name="${PN}-${SLOT}" 895 local desktop_name="${PN}-${SLOT}"
851 fi 896 fi
897 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
852 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 898 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
853 899
900 cat <<-EOF > "${desktop}"
854echo "[Desktop Entry] 901 [Desktop Entry]
855Encoding=UTF-8 902 Encoding=UTF-8
856Version=0.9.2 903 Version=0.9.2
857Name=${name} 904 Name=${name}
858Type=Application 905 Type=Application
859Comment=${DESCRIPTION} 906 Comment=${DESCRIPTION}
860Exec=${exec} 907 Exec=${exec}
908 TryExec=${exec%% *}
861Path=${path} 909 Path=${path}
862Icon=${icon} 910 Icon=${icon}
863Categories=Application;${type};" > "${desktop}" 911 Categories=Application;${type};
912 EOF
864 913
914 (
915 # wrap the env here so that the 'insinto' call
916 # doesn't corrupt the env of the caller
865 insinto /usr/share/applications 917 insinto /usr/share/applications
866 doins "${desktop}" 918 doins "${desktop}"
867 919 )
868 return 0
869} 920}
870 921
871# Make a GDM/KDM Session file 922# Make a GDM/KDM Session file
872# 923#
873# make_desktop_entry(<title>, <command>) 924# make_session_desktop(<title>, <command>)
874# title: File to execute to start the Window Manager 925# title: File to execute to start the Window Manager
875# command: Name of the Window Manager 926# command: Name of the Window Manager
876 927
877make_session_desktop() { 928make_session_desktop() {
878 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 929 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
880 931
881 local title=$1 932 local title=$1
882 local command=$2 933 local command=$2
883 local desktop=${T}/${wm}.desktop 934 local desktop=${T}/${wm}.desktop
884 935
936 cat <<-EOF > "${desktop}"
885echo "[Desktop Entry] 937 [Desktop Entry]
886Encoding=UTF-8 938 Encoding=UTF-8
887Name=${title} 939 Name=${title}
888Comment=This session logs you into ${title} 940 Comment=This session logs you into ${title}
889Exec=${command} 941 Exec=${command}
890TryExec=${command} 942 TryExec=${command}
891Type=Application" > "${desktop}" 943 Type=Application
944 EOF
892 945
946 (
947 # wrap the env here so that the 'insinto' call
948 # doesn't corrupt the env of the caller
893 insinto /usr/share/xsessions 949 insinto /usr/share/xsessions
894 doins "${desktop}" 950 doins "${desktop}"
951 )
895} 952}
896 953
897domenu() { 954domenu() {
955 (
956 # wrap the env here so that the 'insinto' call
957 # doesn't corrupt the env of the caller
898 local i j 958 local i j ret=0
899 insinto /usr/share/applications 959 insinto /usr/share/applications
900 for i in "$@" ; do 960 for i in "$@" ; do
901 if [[ -f ${i} ]] ; then 961 if [[ -f ${i} ]] ; then
902 doins "${i}" 962 doins "${i}"
963 ((ret+=$?))
903 elif [[ -d ${i} ]] ; then 964 elif [[ -d ${i} ]] ; then
904 for j in "${i}"/*.desktop ; do 965 for j in "${i}"/*.desktop ; do
905 doins "${j}" 966 doins "${j}"
967 ((ret+=$?))
906 done 968 done
907 fi 969 fi
908 done 970 done
971 exit ${ret}
972 )
909} 973}
910newmenu() { 974newmenu() {
975 (
976 # wrap the env here so that the 'insinto' call
977 # doesn't corrupt the env of the caller
911 insinto /usr/share/applications 978 insinto /usr/share/applications
912 newins "$1" "$2" 979 newins "$@"
980 )
913} 981}
914 982
915doicon() { 983doicon() {
984 (
985 # wrap the env here so that the 'insinto' call
986 # doesn't corrupt the env of the caller
916 local i j 987 local i j ret
917 insinto /usr/share/pixmaps 988 insinto /usr/share/pixmaps
918 for i in "$@" ; do 989 for i in "$@" ; do
919 if [[ -f ${i} ]] ; then 990 if [[ -f ${i} ]] ; then
920 doins "${i}" 991 doins "${i}"
992 ((ret+=$?))
921 elif [[ -d ${i} ]] ; then 993 elif [[ -d ${i} ]] ; then
922 for j in "${i}"/*.png ; do 994 for j in "${i}"/*.png ; do
923 doins "${j}" 995 doins "${j}"
996 ((ret+=$?))
924 done 997 done
925 fi 998 fi
926 done 999 done
1000 exit ${ret}
1001 )
927} 1002}
928newicon() { 1003newicon() {
1004 (
1005 # wrap the env here so that the 'insinto' call
1006 # doesn't corrupt the env of the caller
929 insinto /usr/share/pixmaps 1007 insinto /usr/share/pixmaps
930 newins "$1" "$2" 1008 newins "$@"
1009 )
931} 1010}
932 1011
933############################################################## 1012##############################################################
934# END: Handle .desktop files and menu entries # 1013# END: Handle .desktop files and menu entries #
935############################################################## 1014##############################################################
936 1015
937 1016
938# for internal use only (unpack_pdv and unpack_makeself) 1017# for internal use only (unpack_pdv and unpack_makeself)
939find_unpackable_file() { 1018find_unpackable_file() {
940 local src="$1" 1019 local src=$1
941 if [ -z "${src}" ] 1020 if [[ -z ${src} ]] ; then
942 then
943 src="${DISTDIR}/${A}" 1021 src=${DISTDIR}/${A}
944 else 1022 else
945 if [ -e "${DISTDIR}/${src}" ] 1023 if [[ -e ${DISTDIR}/${src} ]] ; then
946 then
947 src="${DISTDIR}/${src}" 1024 src=${DISTDIR}/${src}
948 elif [ -e "${PWD}/${src}" ] 1025 elif [[ -e ${PWD}/${src} ]] ; then
949 then
950 src="${PWD}/${src}" 1026 src=${PWD}/${src}
951 elif [ -e "${src}" ] 1027 elif [[ -e ${src} ]] ; then
952 then
953 src="${src}" 1028 src=${src}
954 fi
955 fi 1029 fi
956 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 1030 fi
1031 [[ ! -e ${src} ]] && return 1
957 echo "${src}" 1032 echo "${src}"
958} 1033}
959 1034
960# Unpack those pesky pdv generated files ... 1035# Unpack those pesky pdv generated files ...
961# They're self-unpacking programs with the binary package stuffed in 1036# They're self-unpacking programs with the binary package stuffed in
962# the middle of the archive. Valve seems to use it a lot ... too bad 1037# the middle of the archive. Valve seems to use it a lot ... too bad
963# it seems to like to segfault a lot :(. So lets take it apart ourselves. 1038# it seems to like to segfault a lot :(. So lets take it apart ourselves.
964# 1039#
965# Usage: unpack_pdv [file to unpack] [size of off_t] 1040# Usage: unpack_pdv [file to unpack] [size of off_t]
966# - you have to specify the off_t size ... i have no idea how to extract that 1041# - you have to specify the off_t size ... i have no idea how to extract that
967# information out of the binary executable myself. basically you pass in 1042# information out of the binary executable myself. basically you pass in
968# the size of the off_t type (in bytes) on the machine that built the pdv 1043# the size of the off_t type (in bytes) on the machine that built the pdv
969# archive. one way to determine this is by running the following commands: 1044# archive. one way to determine this is by running the following commands:
970# strings <pdv archive> | grep lseek 1045# strings <pdv archive> | grep lseek
971# strace -elseek <pdv archive> 1046# strace -elseek <pdv archive>
972# basically look for the first lseek command (we do the strings/grep because 1047# basically look for the first lseek command (we do the strings/grep because
973# sometimes the function call is _llseek or something) and steal the 2nd 1048# sometimes the function call is _llseek or something) and steal the 2nd
974# parameter. here is an example: 1049# parameter. here is an example:
975# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1050# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
976# lseek 1051# lseek
977# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1052# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
978# lseek(3, -4, SEEK_END) = 2981250 1053# lseek(3, -4, SEEK_END) = 2981250
979# thus we would pass in the value of '4' as the second parameter. 1054# thus we would pass in the value of '4' as the second parameter.
980unpack_pdv() { 1055unpack_pdv() {
981 local src="`find_unpackable_file $1`" 1056 local src=$(find_unpackable_file "$1")
982 local sizeoff_t="$2" 1057 local sizeoff_t=$2
983 1058
1059 [[ -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 :(" 1060 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
985 1061
986 local shrtsrc="`basename ${src}`" 1062 local shrtsrc=$(basename "${src}")
987 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1063 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
988 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1064 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\"` 1065 local tailskip=$(tail -c $((${sizeoff_t}*2)) "${src}" | head -c ${sizeoff_t} | hexdump -e \"%i\")
990 1066
991 # grab metadata for debug reasons 1067 # grab metadata for debug reasons
992 local metafile="$(emktemp)" 1068 local metafile=$(emktemp)
993 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1069 tail -c +$((${metaskip}+1)) "${src}" > "${metafile}"
994 1070
995 # rip out the final file name from the metadata 1071 # rip out the final file name from the metadata
996 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1072 local datafile=$(tail -c +$((${metaskip}+1)) "${src}" | strings | head -n 1)
997 datafile="`basename ${datafile}`" 1073 datafile=$(basename "${datafile}")
998 1074
999 # now lets uncompress/untar the file if need be 1075 # now lets uncompress/untar the file if need be
1000 local tmpfile="$(emktemp)" 1076 local tmpfile=$(emktemp)
1001 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1077 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1002 1078
1003 local iscompressed="`file -b ${tmpfile}`" 1079 local iscompressed=$(file -b "${tmpfile}")
1004 if [ "${iscompressed:0:8}" == "compress" ] ; then 1080 if [[ ${iscompressed:0:8} == "compress" ]] ; then
1005 iscompressed=1 1081 iscompressed=1
1006 mv ${tmpfile}{,.Z} 1082 mv ${tmpfile}{,.Z}
1007 gunzip ${tmpfile} 1083 gunzip ${tmpfile}
1008 else 1084 else
1009 iscompressed=0 1085 iscompressed=0
1010 fi 1086 fi
1011 local istar="`file -b ${tmpfile}`" 1087 local istar=$(file -b "${tmpfile}")
1012 if [ "${istar:0:9}" == "POSIX tar" ] ; then 1088 if [[ ${istar:0:9} == "POSIX tar" ]] ; then
1013 istar=1 1089 istar=1
1014 else 1090 else
1015 istar=0 1091 istar=0
1016 fi 1092 fi
1017 1093
1053# many other game companies. 1129# many other game companies.
1054# 1130#
1055# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1131# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1056# - If the file is not specified then unpack will utilize ${A}. 1132# - If the file is not specified then unpack will utilize ${A}.
1057# - If the offset is not specified then we will attempt to extract 1133# - If the offset is not specified then we will attempt to extract
1058# the proper offset from the script itself. 1134# the proper offset from the script itself.
1059unpack_makeself() { 1135unpack_makeself() {
1136 local src_input=${1:-${A}}
1060 local src="$(find_unpackable_file "$1")" 1137 local src=$(find_unpackable_file "${src_input}")
1061 local skip="$2" 1138 local skip=$2
1062 local exe="$3" 1139 local exe=$3
1063 1140
1141 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1142
1064 local shrtsrc="$(basename "${src}")" 1143 local shrtsrc=$(basename "${src}")
1065 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1144 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1066 if [ -z "${skip}" ] 1145 if [[ -z ${skip} ]] ; then
1067 then
1068 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1146 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1069 local skip=0 1147 local skip=0
1070 exe=tail 1148 exe=tail
1071 case ${ver} in 1149 case ${ver} in
1072 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1150 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1073 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1151 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1074 ;; 1152 ;;
1075 2.0|2.0.1) 1153 2.0|2.0.1)
1076 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1154 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1077 ;; 1155 ;;
1085 ;; 1163 ;;
1086 2.1.3) 1164 2.1.3)
1087 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1165 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1088 let skip="skip + 1" 1166 let skip="skip + 1"
1089 ;; 1167 ;;
1090 2.1.4) 1168 2.1.4|2.1.5)
1091 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1169 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1092 skip=$(head -n ${skip} "${src}" | wc -c) 1170 skip=$(head -n ${skip} "${src}" | wc -c)
1093 exe="dd" 1171 exe="dd"
1094 ;; 1172 ;;
1095 *) 1173 *)
1107 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1185 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1108 *) die "makeself cant handle exe '${exe}'" 1186 *) die "makeself cant handle exe '${exe}'"
1109 esac 1187 esac
1110 1188
1111 # lets grab the first few bytes of the file to figure out what kind of archive it is 1189 # lets grab the first few bytes of the file to figure out what kind of archive it is
1112 local tmpfile="$(emktemp)" 1190 local tmpfile=$(emktemp)
1113 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1191 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1114 local filetype="$(file -b "${tmpfile}")" 1192 local filetype=$(file -b "${tmpfile}")
1115 case ${filetype} in 1193 case ${filetype} in
1116 *tar\ archive) 1194 *tar\ archive*)
1117 eval ${exe} | tar --no-same-owner -xf - 1195 eval ${exe} | tar --no-same-owner -xf -
1118 ;; 1196 ;;
1119 bzip2*) 1197 bzip2*)
1120 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1198 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1121 ;; 1199 ;;
1140check_license() { 1218check_license() {
1141 local lic=$1 1219 local lic=$1
1142 if [ -z "${lic}" ] ; then 1220 if [ -z "${lic}" ] ; then
1143 lic="${PORTDIR}/licenses/${LICENSE}" 1221 lic="${PORTDIR}/licenses/${LICENSE}"
1144 else 1222 else
1145 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1223 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1146 lic="${PORTDIR}/licenses/${src}" 1224 lic="${PORTDIR}/licenses/${lic}"
1147 elif [ -e "${PWD}/${src}" ] ; then 1225 elif [ -e "${PWD}/${lic}" ] ; then
1148 lic="${PWD}/${src}" 1226 lic="${PWD}/${lic}"
1149 elif [ -e "${src}" ] ; then 1227 elif [ -e "${lic}" ] ; then
1150 lic="${src}" 1228 lic="${lic}"
1151 fi
1152 fi 1229 fi
1230 fi
1153 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1231 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1154 local l="`basename ${lic}`" 1232 local l="`basename ${lic}`"
1155 1233
1156 # here is where we check for the licenses the user already 1234 # 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 1235 # accepted ... if we don't find a match, we make the user accept
1158 local shopts=$- 1236 local shopts=$-
1159 local alic 1237 local alic
1160 set -o noglob #so that bash doesn't expand "*" 1238 set -o noglob #so that bash doesn't expand "*"
1161 for alic in ${ACCEPT_LICENSE} ; do 1239 for alic in ${ACCEPT_LICENSE} ; do
1162 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1240 if [[ ${alic} == ${l} ]]; then
1163 set +o noglob; set -${shopts} #reset old shell opts 1241 set +o noglob; set -${shopts} #reset old shell opts
1164 return 0 1242 return 0
1165 fi 1243 fi
1166 done 1244 done
1167 set +o noglob; set -$shopts #reset old shell opts 1245 set +o noglob; set -$shopts #reset old shell opts
1168 1246
1169 local licmsg="$(emktemp)" 1247 local licmsg=$(emktemp)
1170 cat << EOF > ${licmsg} 1248 cat <<-EOF > ${licmsg}
1171********************************************************** 1249 **********************************************************
1172The following license outlines the terms of use of this 1250 The following license outlines the terms of use of this
1173package. You MUST accept this license for installation to 1251 package. You MUST accept this license for installation to
1174continue. When you are done viewing, hit 'q'. If you 1252 continue. When you are done viewing, hit 'q'. If you
1175CTRL+C out of this, the install will not run! 1253 CTRL+C out of this, the install will not run!
1176********************************************************** 1254 **********************************************************
1177 1255
1178EOF 1256 EOF
1179 cat ${lic} >> ${licmsg} 1257 cat ${lic} >> ${licmsg}
1180 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}" 1258 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}"
1181 einfon "Do you accept the terms of this license (${l})? [yes/no] " 1259 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1182 read alic 1260 read alic
1183 case ${alic} in 1261 case ${alic} in
1200# and when the function returns, you can assume that the cd has been 1278# and when the function returns, you can assume that the cd has been
1201# found at CDROM_ROOT. 1279# found at CDROM_ROOT.
1202# 1280#
1203# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1281# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1204# etc... if you want to give the cds better names, then just export 1282# etc... if you want to give the cds better names, then just export
1205# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1283# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1284# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1285# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1286# CDROM_NAME_2="data cd"
1287# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1206# 1288#
1207# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1289# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1208# 1290#
1209# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1291# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1210# - this will attempt to locate a cd based upon a file that is on 1292# - this will attempt to locate a cd based upon a file that is on
1211# the cd ... the more files you give this function, the more cds 1293# the cd ... the more files you give this function, the more cds
1212# the cdrom functions will handle 1294# the cdrom functions will handle
1213cdrom_get_cds() { 1295cdrom_get_cds() {
1214 # first we figure out how many cds we're dealing with by 1296 # first we figure out how many cds we're dealing with by
1215 # the # of files they gave us 1297 # the # of files they gave us
1216 local cdcnt=0 1298 local cdcnt=0
1217 local f= 1299 local f=
1218 for f in "$@" ; do 1300 for f in "$@" ; do
1219 cdcnt=$((cdcnt + 1)) 1301 ((++cdcnt))
1220 export CDROM_CHECK_${cdcnt}="$f" 1302 export CDROM_CHECK_${cdcnt}="$f"
1221 done 1303 done
1222 export CDROM_TOTAL_CDS=${cdcnt} 1304 export CDROM_TOTAL_CDS=${cdcnt}
1223 export CDROM_CURRENT_CD=1 1305 export CDROM_CURRENT_CD=1
1224 1306
1225 # now we see if the user gave use CD_ROOT ... 1307 # now we see if the user gave use CD_ROOT ...
1226 # if they did, let's just believe them that it's correct 1308 # if they did, let's just believe them that it's correct
1227 if [[ ! -z ${CD_ROOT} ]] ; then
1228 export CDROM_ROOT=${CD_ROOT}
1229 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1230 return
1231 fi
1232 # do the same for CD_ROOT_X
1233 if [[ ! -z ${CD_ROOT_1} ]] ; then 1309 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1234 local var= 1310 local var=
1235 cdcnt=0 1311 cdcnt=0
1236 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1312 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1237 cdcnt=$((cdcnt + 1)) 1313 ((++cdcnt))
1238 var="CD_ROOT_${cdcnt}" 1314 var="CD_ROOT_${cdcnt}"
1315 [[ -z ${!var} ]] && var="CD_ROOT"
1239 if [[ -z ${!var} ]] ; then 1316 if [[ -z ${!var} ]] ; then
1240 eerror "You must either use just the CD_ROOT" 1317 eerror "You must either use just the CD_ROOT"
1241 eerror "or specify ALL the CD_ROOT_X variables." 1318 eerror "or specify ALL the CD_ROOT_X variables."
1242 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1319 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1243 die "could not locate CD_ROOT_${cdcnt}" 1320 die "could not locate CD_ROOT_${cdcnt}"
1244 fi 1321 fi
1245 export CDROM_ROOTS_${cdcnt}="${!var}"
1246 done 1322 done
1247 export CDROM_ROOT=${CDROM_ROOTS_1} 1323 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1248 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1324 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1325 export CDROM_SET=-1
1326 for f in ${CDROM_CHECK_1//:/ } ; do
1327 ((++CDROM_SET))
1328 [[ -e ${CD_ROOT}/${f} ]] && break
1329 done
1330 export CDROM_MATCH=${f}
1249 return 1331 return
1250 fi 1332 fi
1251 1333
1334 # User didn't help us out so lets make sure they know they can
1335 # simplify the whole process ...
1252 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1336 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1253 einfon "This ebuild will need the " 1337 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1254 if [[ -z ${CDROM_NAME} ]] ; then
1255 echo "cdrom for ${PN}."
1256 else
1257 echo "${CDROM_NAME}."
1258 fi
1259 echo 1338 echo
1260 einfo "If you do not have the CD, but have the data files" 1339 einfo "If you do not have the CD, but have the data files"
1261 einfo "mounted somewhere on your filesystem, just export" 1340 einfo "mounted somewhere on your filesystem, just export"
1262 einfo "the variable CD_ROOT so that it points to the" 1341 einfo "the variable CD_ROOT so that it points to the"
1263 einfo "directory containing the files." 1342 einfo "directory containing the files."
1264 echo 1343 echo
1265 einfo "For example:" 1344 einfo "For example:"
1266 einfo "export CD_ROOT=/mnt/cdrom" 1345 einfo "export CD_ROOT=/mnt/cdrom"
1267 echo 1346 echo
1268 else 1347 else
1348 if [[ -n ${CDROM_NAME_SET} ]] ; then
1349 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1350 cdcnt=0
1351 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1352 ((++cdcnt))
1353 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1354 done
1355 fi
1356
1269 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1357 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1270 cdcnt=0 1358 cdcnt=0
1271 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1359 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1272 cdcnt=$((cdcnt + 1)) 1360 ((++cdcnt))
1273 var="CDROM_NAME_${cdcnt}" 1361 var="CDROM_NAME_${cdcnt}"
1274 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1362 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1275 done 1363 done
1276 echo 1364 echo
1277 einfo "If you do not have the CDs, but have the data files" 1365 einfo "If you do not have the CDs, but have the data files"
1278 einfo "mounted somewhere on your filesystem, just export" 1366 einfo "mounted somewhere on your filesystem, just export"
1279 einfo "the following variables so they point to the right place:" 1367 einfo "the following variables so they point to the right place:"
1280 einfon "" 1368 einfon ""
1281 cdcnt=0 1369 cdcnt=0
1282 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1370 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1283 cdcnt=$((cdcnt + 1)) 1371 ((++cdcnt))
1284 echo -n " CD_ROOT_${cdcnt}" 1372 echo -n " CD_ROOT_${cdcnt}"
1285 done 1373 done
1286 echo 1374 echo
1287 einfo "Or, if you have all the files in the same place, or" 1375 einfo "Or, if you have all the files in the same place, or"
1288 einfo "you only have one cdrom, you can export CD_ROOT" 1376 einfo "you only have one cdrom, you can export CD_ROOT"
1291 echo 1379 echo
1292 einfo "For example:" 1380 einfo "For example:"
1293 einfo "export CD_ROOT_1=/mnt/cdrom" 1381 einfo "export CD_ROOT_1=/mnt/cdrom"
1294 echo 1382 echo
1295 fi 1383 fi
1384
1385 export CDROM_SET=""
1296 export CDROM_CURRENT_CD=0 1386 export CDROM_CURRENT_CD=0
1297 cdrom_load_next_cd 1387 cdrom_load_next_cd
1298} 1388}
1299 1389
1300# this is only used when you need access to more than one cd. 1390# this is only used when you need access to more than one cd.
1301# when you have finished using the first cd, just call this function. 1391# when you have finished using the first cd, just call this function.
1302# when it returns, CDROM_ROOT will be pointing to the second cd. 1392# when it returns, CDROM_ROOT will be pointing to the second cd.
1303# remember, you can only go forward in the cd chain, you can't go back. 1393# remember, you can only go forward in the cd chain, you can't go back.
1304cdrom_load_next_cd() { 1394cdrom_load_next_cd() {
1305 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1306 local var= 1395 local var
1307 1396 ((++CDROM_CURRENT_CD))
1308 if [[ ! -z ${CD_ROOT} ]] ; then
1309 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1310 return
1311 fi
1312 1397
1313 unset CDROM_ROOT 1398 unset CDROM_ROOT
1314 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1399 var=CD_ROOT_${CDROM_CURRENT_CD}
1400 [[ -z ${!var} ]] && var="CD_ROOT"
1315 if [[ -z ${!var} ]] ; then 1401 if [[ -z ${!var} ]] ; then
1316 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1402 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1317 cdrom_locate_file_on_cd ${!var} 1403 _cdrom_locate_file_on_cd ${!var}
1318 else 1404 else
1319 export CDROM_ROOT=${!var} 1405 export CDROM_ROOT=${!var}
1320 fi 1406 fi
1321 1407
1322 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1408 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1327# all it does is try to locate a give file on a cd ... if the cd isn't 1413# all it does is try to locate a give file on a cd ... if the cd isn't
1328# found, then a message asking for the user to insert the cdrom will be 1414# found, then a message asking for the user to insert the cdrom will be
1329# displayed and we'll hang out here until: 1415# displayed and we'll hang out here until:
1330# (1) the file is found on a mounted cdrom 1416# (1) the file is found on a mounted cdrom
1331# (2) the user hits CTRL+C 1417# (2) the user hits CTRL+C
1332cdrom_locate_file_on_cd() { 1418_cdrom_locate_file_on_cd() {
1419 local mline=""
1420 local showedmsg=0
1421
1333 while [[ -z ${CDROM_ROOT} ]] ; do 1422 while [[ -z ${CDROM_ROOT} ]] ; do
1423 local i=0
1424 local -a cdset=(${*//:/ })
1425 if [[ -n ${CDROM_SET} ]] ; then
1426 cdset=(${cdset[${CDROM_SET}]})
1427 fi
1428
1429 while [[ -n ${cdset[${i}]} ]] ; do
1334 local dir="$(dirname ${@})" 1430 local dir=$(dirname ${cdset[${i}]})
1335 local file="$(basename ${@})" 1431 local file=$(basename ${cdset[${i}]})
1336 local mline=""
1337 local showedmsg=0
1338 1432
1339 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1433 local point= node= fs= foo=
1340 [[ -d ${mline}/${dir} ]] || continue 1434 while read point node fs foo ; do
1435 [[ " cd9660 iso9660 " != *" ${fs} "* ]] && \
1436 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1437 && continue
1438 point=${point//\040/ }
1341 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1439 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1342 && export CDROM_ROOT=${mline} 1440 export CDROM_ROOT=${point}
1441 export CDROM_SET=${i}
1442 export CDROM_MATCH=${cdset[${i}]}
1443 return
1444 done <<< "$(get_mounts)"
1445
1446 ((++i))
1343 done 1447 done
1344 1448
1345 if [[ -z ${CDROM_ROOT} ]] ; then
1346 echo 1449 echo
1347 if [[ ${showedmsg} -eq 0 ]] ; then 1450 if [[ ${showedmsg} -eq 0 ]] ; then
1348 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1451 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1349 if [[ -z ${CDROM_NAME} ]] ; then 1452 if [[ -z ${CDROM_NAME} ]] ; then
1350 einfo "Please insert the cdrom for ${PN} now !" 1453 einfo "Please insert+mount the cdrom for ${PN} now !"
1351 else
1352 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1353 fi
1354 else 1454 else
1355 if [[ -z ${CDROM_NAME_1} ]] ; then
1356 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1357 else
1358 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1359 einfo "Please insert+mount the ${!var} cdrom now !" 1455 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1360 fi
1361 fi 1456 fi
1362 showedmsg=1 1457 else
1458 if [[ -z ${CDROM_NAME_1} ]] ; then
1459 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1460 else
1461 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1462 einfo "Please insert+mount the ${!var} cdrom now !"
1463 fi
1363 fi 1464 fi
1465 showedmsg=1
1466 fi
1364 einfo "Press return to scan for the cd again" 1467 einfo "Press return to scan for the cd again"
1365 einfo "or hit CTRL+C to abort the emerge." 1468 einfo "or hit CTRL+C to abort the emerge."
1366 echo 1469 echo
1367 einfo "If you are having trouble with the detection" 1470 einfo "If you are having trouble with the detection"
1368 einfo "of your CD, it is possible that you do not have" 1471 einfo "of your CD, it is possible that you do not have"
1369 einfo "Joliet support enabled in your kernel. Please" 1472 einfo "Joliet support enabled in your kernel. Please"
1370 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1473 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1371 read 1474 read || die "something is screwed with your system"
1372 fi
1373 done 1475 done
1374} 1476}
1375 1477
1376# Make sure that LINGUAS only contains languages that 1478# Make sure that LINGUAS only contains languages that
1377# a package can support 1479# a package can support
1378# 1480#
1379# usage: strip-linguas <allow LINGUAS> 1481# usage: strip-linguas <allow LINGUAS>
1380# strip-linguas -i <directories of .po files> 1482# strip-linguas -i <directories of .po files>
1381# strip-linguas -u <directories of .po files> 1483# strip-linguas -u <directories of .po files>
1382# 1484#
1383# The first form allows you to specify a list of LINGUAS. 1485# The first form allows you to specify a list of LINGUAS.
1384# The -i builds a list of po files found in all the 1486# The -i builds a list of po files found in all the
1385# directories and uses the intersection of the lists. 1487# directories and uses the intersection of the lists.
1386# The -u builds a list of po files found in all the 1488# The -u builds a list of po files found in all the
1387# directories and uses the union of the lists. 1489# directories and uses the union of the lists.
1388strip-linguas() { 1490strip-linguas() {
1389 local ls newls 1491 local ls newls nols
1390 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1492 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1391 local op=$1; shift 1493 local op=$1; shift
1392 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1494 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1393 local d f 1495 local d f
1394 for d in "$@" ; do 1496 for d in "$@" ; do
1395 if [[ ${op} == "-u" ]] ; then 1497 if [[ ${op} == "-u" ]] ; then
1396 newls=${ls} 1498 newls=${ls}
1397 else 1499 else
1398 newls="" 1500 newls=""
1399 fi 1501 fi
1400 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1502 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1401 if [[ ${op} == "-i" ]] ; then 1503 if [[ ${op} == "-i" ]] ; then
1402 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1504 hasq ${f} ${ls} && newls="${newls} ${f}"
1403 else 1505 else
1404 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1506 hasq ${f} ${ls} || newls="${newls} ${f}"
1405 fi 1507 fi
1406 done 1508 done
1407 ls=${newls} 1509 ls=${newls}
1408 done 1510 done
1409 ls=${ls//.po}
1410 else 1511 else
1411 ls=$@ 1512 ls="$@"
1412 fi 1513 fi
1413 1514
1414 ls=" ${ls} " 1515 nols=""
1415 newls="" 1516 newls=""
1416 for f in ${LINGUAS} ; do 1517 for f in ${LINGUAS} ; do
1417 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1518 if hasq ${f} ${ls} ; then
1418 newls="${newls} ${f}" 1519 newls="${newls} ${f}"
1419 else 1520 else
1420 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1521 nols="${nols} ${f}"
1421 fi 1522 fi
1422 done 1523 done
1423 if [[ -z ${newls} ]] ; then 1524 [[ -n ${nols} ]] \
1424 export LINGUAS="" 1525 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1425 else
1426 export LINGUAS=${newls:1} 1526 export LINGUAS=${newls:1}
1427 fi
1428} 1527}
1429 1528
1430# moved from kernel.eclass since they are generally useful outside of 1529# moved from kernel.eclass since they are generally useful outside of
1431# kernel.eclass -iggy (20041002) 1530# kernel.eclass -iggy (20041002)
1432 1531
1439 while ((i--)) ; do 1538 while ((i--)) ; do
1440 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1539 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1441 done 1540 done
1442 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1541 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1443 case ${ARCH} in 1542 case ${ARCH} in
1444 x86) export ARCH="i386";; 1543 x86) export ARCH="i386";;
1445 amd64) export ARCH="x86_64";; 1544 amd64) export ARCH="x86_64";;
1446 hppa) export ARCH="parisc";; 1545 hppa) export ARCH="parisc";;
1447 mips) export ARCH="mips";; 1546 mips) export ARCH="mips";;
1448 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! 1547 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!
1449 *) export ARCH="${ARCH}";; 1548 *) export ARCH="${ARCH}";;
1450 esac 1549 esac
1451} 1550}
1452 1551
1453# set's ARCH back to what portage expects 1552# set's ARCH back to what portage expects
1454set_arch_to_portage() { 1553set_arch_to_portage() {
1461 1560
1462# Jeremy Huddleston <eradicator@gentoo.org>: 1561# Jeremy Huddleston <eradicator@gentoo.org>:
1463# preserve_old_lib /path/to/libblah.so.0 1562# preserve_old_lib /path/to/libblah.so.0
1464# preserve_old_lib_notify /path/to/libblah.so.0 1563# preserve_old_lib_notify /path/to/libblah.so.0
1465# 1564#
1466# These functions are useful when a lib in your package changes --soname. Such 1565# These functions are useful when a lib in your package changes --library. Such
1467# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1566# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1468# would break packages that link against it. Most people get around this 1567# would break packages that link against it. Most people get around this
1469# by using the portage SLOT mechanism, but that is not always a relevant 1568# by using the portage SLOT mechanism, but that is not always a relevant
1470# solution, so instead you can add the following to your ebuilds: 1569# solution, so instead you can add the following to your ebuilds:
1471# 1570#
1472# src_install() { 1571# pkg_preinst() {
1473# ... 1572# ...
1474# preserve_old_lib /usr/$(get_libdir)/libogg.so.0 1573# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1475# ... 1574# ...
1476# } 1575# }
1477# 1576#
1480# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0 1579# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1481# ... 1580# ...
1482# } 1581# }
1483 1582
1484preserve_old_lib() { 1583preserve_old_lib() {
1485 LIB=$1 1584 if [[ ${EBUILD_PHASE} != "preinst" ]] ; then
1585 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1586# die "Invalid preserve_old_lib() usage"
1587 fi
1588 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1486 1589
1487 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1590 local lib dir
1488 SONAME=`basename ${LIB}` 1591 for lib in "$@" ; do
1489 DIRNAME=`dirname ${LIB}` 1592 [[ -e ${ROOT}/${lib} ]] || continue
1490 1593 dir=${lib%/*}
1491 dodir ${DIRNAME} 1594 dodir ${dir} || die "dodir ${dir} failed"
1492 cp ${ROOT}${LIB} ${D}${DIRNAME} 1595 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
1493 touch ${D}${LIB} 1596 touch "${D}"/${lib}
1494 fi 1597 done
1495} 1598}
1496 1599
1497preserve_old_lib_notify() { 1600preserve_old_lib_notify() {
1498 LIB=$1 1601 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1602 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1603# die "Invalid preserve_old_lib_notify() usage"
1604 fi
1499 1605
1500 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1606 local lib notice=0
1501 SONAME=`basename ${LIB}` 1607 for lib in "$@" ; do
1502 1608 [[ -e ${ROOT}/${lib} ]] || continue
1609 if [[ ${notice} -eq 0 ]] ; then
1610 notice=1
1503 einfo "An old version of an installed library was detected on your system." 1611 ewarn "Old versions of installed libraries were detected on your system."
1504 einfo "In order to avoid breaking packages that link against it, this older version" 1612 ewarn "In order to avoid breaking packages that depend on these old libs,"
1505 einfo "is not being removed. In order to make full use of this newer version," 1613 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1506 einfo "you will need to execute the following command:" 1614 ewarn "in order to remove these old dependencies. If you do not have this"
1507 einfo " revdep-rebuild --soname ${SONAME}" 1615 ewarn "helper program, simply emerge the 'gentoolkit' package."
1508 einfo 1616 ewarn
1509 einfo "After doing that, you can safely remove ${LIB}"
1510 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1511 fi 1617 fi
1618 ewarn " # revdep-rebuild --library ${lib##*/}"
1619 done
1512} 1620}
1513 1621
1514# Hack for people to figure out if a package was built with 1622# Hack for people to figure out if a package was built with
1515# certain USE flags 1623# certain USE flags
1516# 1624#
1517# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1625# Usage: built_with_use [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1518# ex: built_with_use xchat gtk2 1626# ex: built_with_use xchat gtk2
1519# 1627#
1520# Flags: -a all USE flags should be utilized 1628# Flags: -a all USE flags should be utilized
1521# -o at least one USE flag should be utilized 1629# -o at least one USE flag should be utilized
1630# --missing peform the specified action if the flag is not in IUSE (true/false/die)
1631# --hidden USE flag we're checking is hidden expanded so it isnt in IUSE
1522# Note: the default flag is '-a' 1632# Note: the default flag is '-a'
1523built_with_use() { 1633built_with_use() {
1634 local hidden="no"
1635 if [[ $1 == "--hidden" ]] ; then
1636 hidden="yes"
1637 shift
1638 fi
1639
1640 local missing_action="die"
1641 if [[ $1 == "--missing" ]] ; then
1642 missing_action=$2
1643 shift ; shift
1644 case ${missing_action} in
1645 true|false|die) ;;
1646 *) die "unknown action '${missing_action}'";;
1647 esac
1648 fi
1649
1524 local opt=$1 1650 local opt=$1
1525 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1651 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1526 1652
1527 local PKG=$(best_version $1) 1653 local PKG=$(best_version $1)
1654 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1528 shift 1655 shift
1529 1656
1530 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1657 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1531 [[ ! -e ${USEFILE} ]] && return 1 1658 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1659
1660 # if the IUSE file doesn't exist, the read will error out, we need to handle
1661 # this gracefully
1662 if [[ ! -e ${USEFILE} ]] || [[ ! -e ${IUSEFILE} && ${hidden} == "no" ]] ; then
1663 case ${missing_action} in
1664 true) return 0;;
1665 false) return 1;;
1666 die) die "Unable to determine what USE flags $PKG was built with";;
1667 esac
1668 fi
1669
1670 if [[ ${hidden} == "no" ]] ; then
1671 local IUSE_BUILT=$(<${IUSEFILE})
1672 # Don't check USE_EXPAND #147237
1673 local expand
1674 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1675 if [[ $1 == ${expand}_* ]] ; then
1676 expand=""
1677 break
1678 fi
1679 done
1680 if [[ -n ${expand} ]] ; then
1681 if ! has $1 ${IUSE_BUILT} ; then
1682 case ${missing_action} in
1683 true) return 0;;
1684 false) return 1;;
1685 die) die "$PKG does not actually support the $1 USE flag!";;
1686 esac
1687 fi
1688 fi
1689 fi
1532 1690
1533 local USE_BUILT=$(<${USEFILE}) 1691 local USE_BUILT=$(<${USEFILE})
1534 while [[ $# -gt 0 ]] ; do 1692 while [[ $# -gt 0 ]] ; do
1535 if [[ ${opt} = "-o" ]] ; then 1693 if [[ ${opt} = "-o" ]] ; then
1536 has $1 ${USE_BUILT} && return 0 1694 has $1 ${USE_BUILT} && return 0
1551 local f 1709 local f
1552 for f in $(find ${dir} -name configure) ; do 1710 for f in $(find ${dir} -name configure) ; do
1553 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1711 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1554 done 1712 done
1555 eend 0 1713 eend 0
1556}
1557
1558# dopamd <file> [more files]
1559#
1560# Install pam auth config file in /etc/pam.d
1561dopamd() {
1562 [[ -z $1 ]] && die "dopamd requires at least one argument"
1563
1564 use pam || return 0
1565
1566 INSDESTTREE=/etc/pam.d \
1567 doins "$@" || die "failed to install $@"
1568}
1569# newpamd <old name> <new name>
1570#
1571# Install pam file <old name> as <new name> in /etc/pam.d
1572newpamd() {
1573 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1574
1575 use pam || return 0
1576
1577 INSDESTTREE=/etc/pam.d \
1578 newins "$1" "$2" || die "failed to install $1 as $2"
1579} 1714}
1580 1715
1581# make a wrapper script ... 1716# make a wrapper script ...
1582# NOTE: this was originally games_make_wrapper, but I noticed other places where 1717# NOTE: this was originally games_make_wrapper, but I noticed other places where
1583# this could be used, so I have moved it here and made it not games-specific 1718# this could be used, so I have moved it here and made it not games-specific
1588# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1723# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1589# $5 == path for wrapper 1724# $5 == path for wrapper
1590make_wrapper() { 1725make_wrapper() {
1591 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1726 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1592 local tmpwrapper=$(emktemp) 1727 local tmpwrapper=$(emktemp)
1728 # We don't want to quote ${bin} so that people can pass complex
1729 # things as $bin ... "./someprog --args"
1593 cat << EOF > "${tmpwrapper}" 1730 cat << EOF > "${tmpwrapper}"
1594#!/bin/sh 1731#!/bin/sh
1595cd "${chdir}" 1732cd "${chdir:-.}"
1733if [ -n "${libdir}" ] ; then
1734 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1596export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1735 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1736 else
1737 export LD_LIBRARY_PATH="${libdir}"
1738 fi
1739fi
1597exec ${bin} "\$@" 1740exec ${bin} "\$@"
1598EOF 1741EOF
1599 chmod go+rx "${tmpwrapper}" 1742 chmod go+rx "${tmpwrapper}"
1600 if [ -n "${5}" ] 1743 if [[ -n ${path} ]] ; then
1601 then
1602 exeinto ${5} 1744 exeinto "${path}"
1603 newexe "${tmpwrapper}" "${wrapper}" 1745 newexe "${tmpwrapper}" "${wrapper}"
1604 else 1746 else
1605 newbin "${tmpwrapper}" "${wrapper}" 1747 newbin "${tmpwrapper}" "${wrapper}"
1606 fi 1748 fi
1607} 1749}

Legend:
Removed from v.1.185  
changed lines
  Added in v.1.275

  ViewVC Help
Powered by ViewVC 1.1.20