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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20