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

Diff of /eclass/eutils.eclass

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

Revision 1.192 Revision 1.278
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.192 2005/07/15 22:16:49 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.278 2007/04/22 15:55:07 carlo 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
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/Standards/desktop-entry-spec 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
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 case ${catmin} in 818 case ${catmin} in
770 action) type=ActionGame;; 819 action|fps) type=ActionGame;;
771 arcade) type=ArcadeGame;; 820 arcade) type=ArcadeGame;;
772 board) type=BoardGame;; 821 board) type=BoardGame;;
773 kid) type=KidsGame;; 822 kids) type=KidsGame;;
774 emulation) type=Emulator;; 823 emulation) type=Emulator;;
775 puzzle) type=LogicGame;; 824 puzzle) type=LogicGame;;
776 rpg) type=RolePlaying;; 825 rpg) type=RolePlaying;;
777 roguelike) type=RolePlaying;; 826 roguelike) type=RolePlaying;;
778 simulation) type=Simulation;; 827 simulation) type=Simulation;;
779 sports) type=SportsGame;; 828 sports) type=SportsGame;;
780 strategy) type=StrategyGame;; 829 strategy) type=StrategyGame;;
781 *) type=;; 830 *) type=;;
782 esac 831 esac
783 type="Game;${type}" 832 type="Game;${type}"
784 ;; 833 ;;
785 834
786 mail) 835 mail)
790 media) 839 media)
791 case ${catmin} in 840 case ${catmin} in
792 gfx) type=Graphics;; 841 gfx) type=Graphics;;
793 radio) type=Tuner;; 842 radio) type=Tuner;;
794 sound) type=Audio;; 843 sound) type=Audio;;
795 tv) type=TV;; 844 tv) type=TV;;
796 video) type=Video;; 845 video) type=Video;;
797 *) type=;; 846 *) type=;;
798 esac 847 esac
799 type="AudioVideo;${type}" 848 type="AudioVideo;${type}"
800 ;; 849 ;;
801 850
802 net) 851 net)
803 case ${catmin} in 852 case ${catmin} in
804 dialup) type=Dialup;; 853 dialup) type=Dialup;;
805 ftp) type=FileTransfer;; 854 ftp) type=FileTransfer;;
806 im) type=InstantMessaging;; 855 im) type=InstantMessaging;;
807 irc) type=IRCClient;; 856 irc) type=IRCClient;;
808 mail) type=Email;; 857 mail) type=Email;;
809 news) type=News;; 858 news) type=News;;
810 nntp) type=News;; 859 nntp) type=News;;
811 p2p) type=FileTransfer;; 860 p2p) type=FileTransfer;;
812 *) type=;; 861 *) type=;;
813 esac 862 esac
814 type="Network;${type}" 863 type="Network;${type}"
815 ;; 864 ;;
816 865
817 sci) 866 sci)
818 case ${catmin} in 867 case ${catmin} in
819 astro*) type=Astronomoy;; 868 astro*) type=Astronomy;;
820 bio*) type=Biology;; 869 bio*) type=Biology;;
821 calc*) type=Calculator;; 870 calc*) type=Calculator;;
822 chem*) type=Chemistry;; 871 chem*) type=Chemistry;;
823 geo*) type=Geology;; 872 geo*) type=Geology;;
824 math*) type=Math;; 873 math*) type=Math;;
825 *) type=;; 874 *) type=;;
826 esac 875 esac
827 type="Science;${type}" 876 type="Science;${type}"
828 ;; 877 ;;
829 878
830 www) 879 www)
831 case ${catmin} in 880 case ${catmin} in
832 client) type=WebBrowser;; 881 client) type=WebBrowser;;
833 *) type=;; 882 *) type=;;
834 esac 883 esac
835 type="Network" 884 type="Network"
836 ;; 885 ;;
837 886
838 *) 887 *)
843 if [ "${SLOT}" == "0" ] ; then 892 if [ "${SLOT}" == "0" ] ; then
844 local desktop_name="${PN}" 893 local desktop_name="${PN}"
845 else 894 else
846 local desktop_name="${PN}-${SLOT}" 895 local desktop_name="${PN}-${SLOT}"
847 fi 896 fi
897 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
848 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 898 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
849 899
900 cat <<-EOF > "${desktop}"
850echo "[Desktop Entry] 901 [Desktop Entry]
851Encoding=UTF-8 902 Encoding=UTF-8
852Version=0.9.2 903 Version=0.9.2
853Name=${name} 904 Name=${name}
854Type=Application 905 Type=Application
855Comment=${DESCRIPTION} 906 Comment=${DESCRIPTION}
856Exec=${exec} 907 Exec=${exec}
908 TryExec=${exec%% *}
857Path=${path} 909 Path=${path}
858Icon=${icon} 910 Icon=${icon}
859Categories=Application;${type};" > "${desktop}" 911 Categories=Application;${type};
912 EOF
860 913
914 (
915 # wrap the env here so that the 'insinto' call
916 # doesn't corrupt the env of the caller
861 insinto /usr/share/applications 917 insinto /usr/share/applications
862 doins "${desktop}" 918 doins "${desktop}"
863 919 )
864 return 0
865} 920}
921
922
923# Validate desktop entries using desktop-file-utils
924# Carsten Lohrke <carlo@gentoo.org>
925#
926# Usage: validate_desktop_entries [directory ...]
927
928validate_desktop_entries() {
929 if [[ -x /usr/bin/desktop-file-validate ]] ; then
930 einfo "Checking desktop entry validity"
931 local directories=""
932 for d in $@ ; do
933 directories="${directories} ${D}${d}"
934 done
935 for FILE in $(find ${D}/usr/share/applications ${directories} -name "*\.desktop" \
936 -not -path '*.hidden*' | sort -u 2>/dev/null)
937 do
938 local temp=$(desktop-file-validate ${FILE} | grep -v "warning:" | \
939 sed -e "s|error: ||" -e "s|${FILE}:|--|g" )
940 [[ -n $temp ]] && elog ${temp/--/${FILE/${D}/}:}
941 done
942 echo ""
943 else
944 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
945 fi
946}
947
866 948
867# Make a GDM/KDM Session file 949# Make a GDM/KDM Session file
868# 950#
869# make_desktop_entry(<title>, <command>) 951# make_session_desktop(<title>, <command>)
870# title: File to execute to start the Window Manager 952# title: File to execute to start the Window Manager
871# command: Name of the Window Manager 953# command: Name of the Window Manager
872 954
873make_session_desktop() { 955make_session_desktop() {
874 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 956 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
876 958
877 local title=$1 959 local title=$1
878 local command=$2 960 local command=$2
879 local desktop=${T}/${wm}.desktop 961 local desktop=${T}/${wm}.desktop
880 962
963 cat <<-EOF > "${desktop}"
881echo "[Desktop Entry] 964 [Desktop Entry]
882Encoding=UTF-8 965 Encoding=UTF-8
883Name=${title} 966 Name=${title}
884Comment=This session logs you into ${title} 967 Comment=This session logs you into ${title}
885Exec=${command} 968 Exec=${command}
886TryExec=${command} 969 TryExec=${command}
887Type=Application" > "${desktop}" 970 Type=Application
971 EOF
888 972
973 (
974 # wrap the env here so that the 'insinto' call
975 # doesn't corrupt the env of the caller
889 insinto /usr/share/xsessions 976 insinto /usr/share/xsessions
890 doins "${desktop}" 977 doins "${desktop}"
978 )
891} 979}
892 980
893domenu() { 981domenu() {
982 (
983 # wrap the env here so that the 'insinto' call
984 # doesn't corrupt the env of the caller
894 local i j 985 local i j ret=0
895 insinto /usr/share/applications 986 insinto /usr/share/applications
896 for i in "$@" ; do 987 for i in "$@" ; do
897 if [[ -f ${i} ]] ; then 988 if [[ -f ${i} ]] ; then
898 doins "${i}" 989 doins "${i}"
990 ((ret+=$?))
899 elif [[ -d ${i} ]] ; then 991 elif [[ -d ${i} ]] ; then
900 for j in "${i}"/*.desktop ; do 992 for j in "${i}"/*.desktop ; do
901 doins "${j}" 993 doins "${j}"
994 ((ret+=$?))
902 done 995 done
903 fi 996 fi
904 done 997 done
998 exit ${ret}
999 )
905} 1000}
906newmenu() { 1001newmenu() {
1002 (
1003 # wrap the env here so that the 'insinto' call
1004 # doesn't corrupt the env of the caller
907 insinto /usr/share/applications 1005 insinto /usr/share/applications
908 newins "$1" "$2" 1006 newins "$@"
1007 )
909} 1008}
910 1009
911doicon() { 1010doicon() {
1011 (
1012 # wrap the env here so that the 'insinto' call
1013 # doesn't corrupt the env of the caller
912 local i j 1014 local i j ret
913 insinto /usr/share/pixmaps 1015 insinto /usr/share/pixmaps
914 for i in "$@" ; do 1016 for i in "$@" ; do
915 if [[ -f ${i} ]] ; then 1017 if [[ -f ${i} ]] ; then
916 doins "${i}" 1018 doins "${i}"
1019 ((ret+=$?))
917 elif [[ -d ${i} ]] ; then 1020 elif [[ -d ${i} ]] ; then
918 for j in "${i}"/*.png ; do 1021 for j in "${i}"/*.png ; do
919 doins "${j}" 1022 doins "${j}"
1023 ((ret+=$?))
920 done 1024 done
921 fi 1025 fi
922 done 1026 done
1027 exit ${ret}
1028 )
923} 1029}
924newicon() { 1030newicon() {
1031 (
1032 # wrap the env here so that the 'insinto' call
1033 # doesn't corrupt the env of the caller
925 insinto /usr/share/pixmaps 1034 insinto /usr/share/pixmaps
926 newins "$1" "$2" 1035 newins "$@"
1036 )
927} 1037}
928 1038
929############################################################## 1039##############################################################
930# END: Handle .desktop files and menu entries # 1040# END: Handle .desktop files and menu entries #
931############################################################## 1041##############################################################
932 1042
933 1043
934# for internal use only (unpack_pdv and unpack_makeself) 1044# for internal use only (unpack_pdv and unpack_makeself)
935find_unpackable_file() { 1045find_unpackable_file() {
936 local src="$1" 1046 local src=$1
937 if [ -z "${src}" ] 1047 if [[ -z ${src} ]] ; then
938 then
939 src="${DISTDIR}/${A}" 1048 src=${DISTDIR}/${A}
940 else 1049 else
941 if [ -e "${DISTDIR}/${src}" ] 1050 if [[ -e ${DISTDIR}/${src} ]] ; then
942 then
943 src="${DISTDIR}/${src}" 1051 src=${DISTDIR}/${src}
944 elif [ -e "${PWD}/${src}" ] 1052 elif [[ -e ${PWD}/${src} ]] ; then
945 then
946 src="${PWD}/${src}" 1053 src=${PWD}/${src}
947 elif [ -e "${src}" ] 1054 elif [[ -e ${src} ]] ; then
948 then
949 src="${src}" 1055 src=${src}
950 fi
951 fi 1056 fi
952 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 1057 fi
1058 [[ ! -e ${src} ]] && return 1
953 echo "${src}" 1059 echo "${src}"
954} 1060}
955 1061
956# Unpack those pesky pdv generated files ... 1062# Unpack those pesky pdv generated files ...
957# They're self-unpacking programs with the binary package stuffed in 1063# They're self-unpacking programs with the binary package stuffed in
958# the middle of the archive. Valve seems to use it a lot ... too bad 1064# the middle of the archive. Valve seems to use it a lot ... too bad
959# it seems to like to segfault a lot :(. So lets take it apart ourselves. 1065# it seems to like to segfault a lot :(. So lets take it apart ourselves.
960# 1066#
961# Usage: unpack_pdv [file to unpack] [size of off_t] 1067# Usage: unpack_pdv [file to unpack] [size of off_t]
962# - you have to specify the off_t size ... i have no idea how to extract that 1068# - you have to specify the off_t size ... i have no idea how to extract that
963# information out of the binary executable myself. basically you pass in 1069# information out of the binary executable myself. basically you pass in
964# the size of the off_t type (in bytes) on the machine that built the pdv 1070# the size of the off_t type (in bytes) on the machine that built the pdv
965# archive. one way to determine this is by running the following commands: 1071# archive. one way to determine this is by running the following commands:
966# strings <pdv archive> | grep lseek 1072# strings <pdv archive> | grep lseek
967# strace -elseek <pdv archive> 1073# strace -elseek <pdv archive>
968# basically look for the first lseek command (we do the strings/grep because 1074# basically look for the first lseek command (we do the strings/grep because
969# sometimes the function call is _llseek or something) and steal the 2nd 1075# sometimes the function call is _llseek or something) and steal the 2nd
970# parameter. here is an example: 1076# parameter. here is an example:
971# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1077# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
972# lseek 1078# lseek
973# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1079# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
974# lseek(3, -4, SEEK_END) = 2981250 1080# lseek(3, -4, SEEK_END) = 2981250
975# thus we would pass in the value of '4' as the second parameter. 1081# thus we would pass in the value of '4' as the second parameter.
976unpack_pdv() { 1082unpack_pdv() {
977 local src="`find_unpackable_file $1`" 1083 local src=$(find_unpackable_file "$1")
978 local sizeoff_t="$2" 1084 local sizeoff_t=$2
979 1085
1086 [[ -z ${src} ]] && die "Could not locate source for '$1'"
980 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1087 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
981 1088
982 local shrtsrc="`basename ${src}`" 1089 local shrtsrc=$(basename "${src}")
983 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1090 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
984 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1091 local metaskip=$(tail -c ${sizeoff_t} "${src}" | hexdump -e \"%i\")
985 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1092 local tailskip=$(tail -c $((${sizeoff_t}*2)) "${src}" | head -c ${sizeoff_t} | hexdump -e \"%i\")
986 1093
987 # grab metadata for debug reasons 1094 # grab metadata for debug reasons
988 local metafile="$(emktemp)" 1095 local metafile=$(emktemp)
989 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1096 tail -c +$((${metaskip}+1)) "${src}" > "${metafile}"
990 1097
991 # rip out the final file name from the metadata 1098 # rip out the final file name from the metadata
992 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1099 local datafile=$(tail -c +$((${metaskip}+1)) "${src}" | strings | head -n 1)
993 datafile="`basename ${datafile}`" 1100 datafile=$(basename "${datafile}")
994 1101
995 # now lets uncompress/untar the file if need be 1102 # now lets uncompress/untar the file if need be
996 local tmpfile="$(emktemp)" 1103 local tmpfile=$(emktemp)
997 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1104 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
998 1105
999 local iscompressed="`file -b ${tmpfile}`" 1106 local iscompressed=$(file -b "${tmpfile}")
1000 if [ "${iscompressed:0:8}" == "compress" ] ; then 1107 if [[ ${iscompressed:0:8} == "compress" ]] ; then
1001 iscompressed=1 1108 iscompressed=1
1002 mv ${tmpfile}{,.Z} 1109 mv ${tmpfile}{,.Z}
1003 gunzip ${tmpfile} 1110 gunzip ${tmpfile}
1004 else 1111 else
1005 iscompressed=0 1112 iscompressed=0
1006 fi 1113 fi
1007 local istar="`file -b ${tmpfile}`" 1114 local istar=$(file -b "${tmpfile}")
1008 if [ "${istar:0:9}" == "POSIX tar" ] ; then 1115 if [[ ${istar:0:9} == "POSIX tar" ]] ; then
1009 istar=1 1116 istar=1
1010 else 1117 else
1011 istar=0 1118 istar=0
1012 fi 1119 fi
1013 1120
1049# many other game companies. 1156# many other game companies.
1050# 1157#
1051# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1158# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1052# - If the file is not specified then unpack will utilize ${A}. 1159# - If the file is not specified then unpack will utilize ${A}.
1053# - If the offset is not specified then we will attempt to extract 1160# - If the offset is not specified then we will attempt to extract
1054# the proper offset from the script itself. 1161# the proper offset from the script itself.
1055unpack_makeself() { 1162unpack_makeself() {
1163 local src_input=${1:-${A}}
1056 local src="$(find_unpackable_file "$1")" 1164 local src=$(find_unpackable_file "${src_input}")
1057 local skip="$2" 1165 local skip=$2
1058 local exe="$3" 1166 local exe=$3
1059 1167
1168 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1169
1060 local shrtsrc="$(basename "${src}")" 1170 local shrtsrc=$(basename "${src}")
1061 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1171 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1062 if [ -z "${skip}" ] 1172 if [[ -z ${skip} ]] ; then
1063 then
1064 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1173 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1065 local skip=0 1174 local skip=0
1066 exe=tail 1175 exe=tail
1067 case ${ver} in 1176 case ${ver} in
1068 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1177 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1069 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1178 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1070 ;; 1179 ;;
1071 2.0|2.0.1) 1180 2.0|2.0.1)
1072 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1181 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1073 ;; 1182 ;;
1081 ;; 1190 ;;
1082 2.1.3) 1191 2.1.3)
1083 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1192 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1084 let skip="skip + 1" 1193 let skip="skip + 1"
1085 ;; 1194 ;;
1086 2.1.4) 1195 2.1.4|2.1.5)
1087 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1196 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1088 skip=$(head -n ${skip} "${src}" | wc -c) 1197 skip=$(head -n ${skip} "${src}" | wc -c)
1089 exe="dd" 1198 exe="dd"
1090 ;; 1199 ;;
1091 *) 1200 *)
1103 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1212 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1104 *) die "makeself cant handle exe '${exe}'" 1213 *) die "makeself cant handle exe '${exe}'"
1105 esac 1214 esac
1106 1215
1107 # lets grab the first few bytes of the file to figure out what kind of archive it is 1216 # lets grab the first few bytes of the file to figure out what kind of archive it is
1108 local tmpfile="$(emktemp)" 1217 local tmpfile=$(emktemp)
1109 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1218 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1110 local filetype="$(file -b "${tmpfile}")" 1219 local filetype=$(file -b "${tmpfile}")
1111 case ${filetype} in 1220 case ${filetype} in
1112 *tar\ archive) 1221 *tar\ archive*)
1113 eval ${exe} | tar --no-same-owner -xf - 1222 eval ${exe} | tar --no-same-owner -xf -
1114 ;; 1223 ;;
1115 bzip2*) 1224 bzip2*)
1116 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1225 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1117 ;; 1226 ;;
1136check_license() { 1245check_license() {
1137 local lic=$1 1246 local lic=$1
1138 if [ -z "${lic}" ] ; then 1247 if [ -z "${lic}" ] ; then
1139 lic="${PORTDIR}/licenses/${LICENSE}" 1248 lic="${PORTDIR}/licenses/${LICENSE}"
1140 else 1249 else
1141 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1250 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1142 lic="${PORTDIR}/licenses/${src}" 1251 lic="${PORTDIR}/licenses/${lic}"
1143 elif [ -e "${PWD}/${src}" ] ; then 1252 elif [ -e "${PWD}/${lic}" ] ; then
1144 lic="${PWD}/${src}" 1253 lic="${PWD}/${lic}"
1145 elif [ -e "${src}" ] ; then 1254 elif [ -e "${lic}" ] ; then
1146 lic="${src}" 1255 lic="${lic}"
1147 fi
1148 fi 1256 fi
1257 fi
1149 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1258 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1150 local l="`basename ${lic}`" 1259 local l="`basename ${lic}`"
1151 1260
1152 # here is where we check for the licenses the user already 1261 # here is where we check for the licenses the user already
1153 # accepted ... if we don't find a match, we make the user accept 1262 # accepted ... if we don't find a match, we make the user accept
1154 local shopts=$- 1263 local shopts=$-
1155 local alic 1264 local alic
1156 set -o noglob #so that bash doesn't expand "*" 1265 set -o noglob #so that bash doesn't expand "*"
1157 for alic in ${ACCEPT_LICENSE} ; do 1266 for alic in ${ACCEPT_LICENSE} ; do
1158 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1267 if [[ ${alic} == ${l} ]]; then
1159 set +o noglob; set -${shopts} #reset old shell opts 1268 set +o noglob; set -${shopts} #reset old shell opts
1160 return 0 1269 return 0
1161 fi 1270 fi
1162 done 1271 done
1163 set +o noglob; set -$shopts #reset old shell opts 1272 set +o noglob; set -$shopts #reset old shell opts
1164 1273
1165 local licmsg="$(emktemp)" 1274 local licmsg=$(emktemp)
1166 cat << EOF > ${licmsg} 1275 cat <<-EOF > ${licmsg}
1167********************************************************** 1276 **********************************************************
1168The following license outlines the terms of use of this 1277 The following license outlines the terms of use of this
1169package. You MUST accept this license for installation to 1278 package. You MUST accept this license for installation to
1170continue. When you are done viewing, hit 'q'. If you 1279 continue. When you are done viewing, hit 'q'. If you
1171CTRL+C out of this, the install will not run! 1280 CTRL+C out of this, the install will not run!
1172********************************************************** 1281 **********************************************************
1173 1282
1174EOF 1283 EOF
1175 cat ${lic} >> ${licmsg} 1284 cat ${lic} >> ${licmsg}
1176 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}" 1285 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}"
1177 einfon "Do you accept the terms of this license (${l})? [yes/no] " 1286 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1178 read alic 1287 read alic
1179 case ${alic} in 1288 case ${alic} in
1196# and when the function returns, you can assume that the cd has been 1305# and when the function returns, you can assume that the cd has been
1197# found at CDROM_ROOT. 1306# found at CDROM_ROOT.
1198# 1307#
1199# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1308# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1200# etc... if you want to give the cds better names, then just export 1309# etc... if you want to give the cds better names, then just export
1201# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1310# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1311# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1312# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1313# CDROM_NAME_2="data cd"
1314# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1202# 1315#
1203# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1316# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1204# 1317#
1205# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1318# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1206# - this will attempt to locate a cd based upon a file that is on 1319# - this will attempt to locate a cd based upon a file that is on
1207# the cd ... the more files you give this function, the more cds 1320# the cd ... the more files you give this function, the more cds
1208# the cdrom functions will handle 1321# the cdrom functions will handle
1209cdrom_get_cds() { 1322cdrom_get_cds() {
1210 # first we figure out how many cds we're dealing with by 1323 # first we figure out how many cds we're dealing with by
1211 # the # of files they gave us 1324 # the # of files they gave us
1212 local cdcnt=0 1325 local cdcnt=0
1213 local f= 1326 local f=
1214 for f in "$@" ; do 1327 for f in "$@" ; do
1215 cdcnt=$((cdcnt + 1)) 1328 ((++cdcnt))
1216 export CDROM_CHECK_${cdcnt}="$f" 1329 export CDROM_CHECK_${cdcnt}="$f"
1217 done 1330 done
1218 export CDROM_TOTAL_CDS=${cdcnt} 1331 export CDROM_TOTAL_CDS=${cdcnt}
1219 export CDROM_CURRENT_CD=1 1332 export CDROM_CURRENT_CD=1
1220 1333
1221 # now we see if the user gave use CD_ROOT ... 1334 # now we see if the user gave use CD_ROOT ...
1222 # if they did, let's just believe them that it's correct 1335 # if they did, let's just believe them that it's correct
1223 if [[ ! -z ${CD_ROOT} ]] ; then
1224 export CDROM_ROOT=${CD_ROOT}
1225 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1226 return
1227 fi
1228 # do the same for CD_ROOT_X
1229 if [[ ! -z ${CD_ROOT_1} ]] ; then 1336 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1230 local var= 1337 local var=
1231 cdcnt=0 1338 cdcnt=0
1232 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1339 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1233 cdcnt=$((cdcnt + 1)) 1340 ((++cdcnt))
1234 var="CD_ROOT_${cdcnt}" 1341 var="CD_ROOT_${cdcnt}"
1342 [[ -z ${!var} ]] && var="CD_ROOT"
1235 if [[ -z ${!var} ]] ; then 1343 if [[ -z ${!var} ]] ; then
1236 eerror "You must either use just the CD_ROOT" 1344 eerror "You must either use just the CD_ROOT"
1237 eerror "or specify ALL the CD_ROOT_X variables." 1345 eerror "or specify ALL the CD_ROOT_X variables."
1238 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1346 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1239 die "could not locate CD_ROOT_${cdcnt}" 1347 die "could not locate CD_ROOT_${cdcnt}"
1240 fi 1348 fi
1241 export CDROM_ROOTS_${cdcnt}="${!var}"
1242 done 1349 done
1243 export CDROM_ROOT=${CDROM_ROOTS_1} 1350 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1244 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1351 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1352 export CDROM_SET=-1
1353 for f in ${CDROM_CHECK_1//:/ } ; do
1354 ((++CDROM_SET))
1355 [[ -e ${CD_ROOT}/${f} ]] && break
1356 done
1357 export CDROM_MATCH=${f}
1245 return 1358 return
1246 fi 1359 fi
1247 1360
1361 # User didn't help us out so lets make sure they know they can
1362 # simplify the whole process ...
1248 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1363 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1249 einfon "This ebuild will need the " 1364 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1250 if [[ -z ${CDROM_NAME} ]] ; then
1251 echo "cdrom for ${PN}."
1252 else
1253 echo "${CDROM_NAME}."
1254 fi
1255 echo 1365 echo
1256 einfo "If you do not have the CD, but have the data files" 1366 einfo "If you do not have the CD, but have the data files"
1257 einfo "mounted somewhere on your filesystem, just export" 1367 einfo "mounted somewhere on your filesystem, just export"
1258 einfo "the variable CD_ROOT so that it points to the" 1368 einfo "the variable CD_ROOT so that it points to the"
1259 einfo "directory containing the files." 1369 einfo "directory containing the files."
1260 echo 1370 echo
1261 einfo "For example:" 1371 einfo "For example:"
1262 einfo "export CD_ROOT=/mnt/cdrom" 1372 einfo "export CD_ROOT=/mnt/cdrom"
1263 echo 1373 echo
1264 else 1374 else
1375 if [[ -n ${CDROM_NAME_SET} ]] ; then
1376 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1377 cdcnt=0
1378 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1379 ((++cdcnt))
1380 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1381 done
1382 fi
1383
1265 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1384 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1266 cdcnt=0 1385 cdcnt=0
1267 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1386 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1268 cdcnt=$((cdcnt + 1)) 1387 ((++cdcnt))
1269 var="CDROM_NAME_${cdcnt}" 1388 var="CDROM_NAME_${cdcnt}"
1270 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1389 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1271 done 1390 done
1272 echo 1391 echo
1273 einfo "If you do not have the CDs, but have the data files" 1392 einfo "If you do not have the CDs, but have the data files"
1274 einfo "mounted somewhere on your filesystem, just export" 1393 einfo "mounted somewhere on your filesystem, just export"
1275 einfo "the following variables so they point to the right place:" 1394 einfo "the following variables so they point to the right place:"
1276 einfon "" 1395 einfon ""
1277 cdcnt=0 1396 cdcnt=0
1278 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1397 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1279 cdcnt=$((cdcnt + 1)) 1398 ((++cdcnt))
1280 echo -n " CD_ROOT_${cdcnt}" 1399 echo -n " CD_ROOT_${cdcnt}"
1281 done 1400 done
1282 echo 1401 echo
1283 einfo "Or, if you have all the files in the same place, or" 1402 einfo "Or, if you have all the files in the same place, or"
1284 einfo "you only have one cdrom, you can export CD_ROOT" 1403 einfo "you only have one cdrom, you can export CD_ROOT"
1287 echo 1406 echo
1288 einfo "For example:" 1407 einfo "For example:"
1289 einfo "export CD_ROOT_1=/mnt/cdrom" 1408 einfo "export CD_ROOT_1=/mnt/cdrom"
1290 echo 1409 echo
1291 fi 1410 fi
1411
1412 export CDROM_SET=""
1292 export CDROM_CURRENT_CD=0 1413 export CDROM_CURRENT_CD=0
1293 cdrom_load_next_cd 1414 cdrom_load_next_cd
1294} 1415}
1295 1416
1296# this is only used when you need access to more than one cd. 1417# this is only used when you need access to more than one cd.
1297# when you have finished using the first cd, just call this function. 1418# when you have finished using the first cd, just call this function.
1298# when it returns, CDROM_ROOT will be pointing to the second cd. 1419# when it returns, CDROM_ROOT will be pointing to the second cd.
1299# remember, you can only go forward in the cd chain, you can't go back. 1420# remember, you can only go forward in the cd chain, you can't go back.
1300cdrom_load_next_cd() { 1421cdrom_load_next_cd() {
1301 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1302 local var= 1422 local var
1303 1423 ((++CDROM_CURRENT_CD))
1304 if [[ ! -z ${CD_ROOT} ]] ; then
1305 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1306 return
1307 fi
1308 1424
1309 unset CDROM_ROOT 1425 unset CDROM_ROOT
1310 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1426 var=CD_ROOT_${CDROM_CURRENT_CD}
1427 [[ -z ${!var} ]] && var="CD_ROOT"
1311 if [[ -z ${!var} ]] ; then 1428 if [[ -z ${!var} ]] ; then
1312 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1429 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1313 cdrom_locate_file_on_cd ${!var} 1430 _cdrom_locate_file_on_cd ${!var}
1314 else 1431 else
1315 export CDROM_ROOT=${!var} 1432 export CDROM_ROOT=${!var}
1316 fi 1433 fi
1317 1434
1318 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1435 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1323# all it does is try to locate a give file on a cd ... if the cd isn't 1440# all it does is try to locate a give file on a cd ... if the cd isn't
1324# found, then a message asking for the user to insert the cdrom will be 1441# found, then a message asking for the user to insert the cdrom will be
1325# displayed and we'll hang out here until: 1442# displayed and we'll hang out here until:
1326# (1) the file is found on a mounted cdrom 1443# (1) the file is found on a mounted cdrom
1327# (2) the user hits CTRL+C 1444# (2) the user hits CTRL+C
1328cdrom_locate_file_on_cd() { 1445_cdrom_locate_file_on_cd() {
1446 local mline=""
1447 local showedmsg=0
1448
1329 while [[ -z ${CDROM_ROOT} ]] ; do 1449 while [[ -z ${CDROM_ROOT} ]] ; do
1330 local dir=$(dirname "$*") 1450 local i=0
1451 local -a cdset=(${*//:/ })
1452 if [[ -n ${CDROM_SET} ]] ; then
1453 cdset=(${cdset[${CDROM_SET}]})
1454 fi
1455
1456 while [[ -n ${cdset[${i}]} ]] ; do
1457 local dir=$(dirname ${cdset[${i}]})
1331 local file=$(basename "$*") 1458 local file=$(basename ${cdset[${i}]})
1332 local mline=""
1333 local showedmsg=0
1334 1459
1335 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1460 local point= node= fs= foo=
1336 [[ -d ${mline}/${dir} ]] || continue 1461 while read point node fs foo ; do
1462 [[ " cd9660 iso9660 " != *" ${fs} "* ]] && \
1463 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1464 && continue
1465 point=${point//\040/ }
1337 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1466 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1338 && export CDROM_ROOT=${mline} 1467 export CDROM_ROOT=${point}
1468 export CDROM_SET=${i}
1469 export CDROM_MATCH=${cdset[${i}]}
1470 return
1471 done <<< "$(get_mounts)"
1472
1473 ((++i))
1339 done 1474 done
1340 1475
1341 if [[ -z ${CDROM_ROOT} ]] ; then
1342 echo 1476 echo
1343 if [[ ${showedmsg} -eq 0 ]] ; then 1477 if [[ ${showedmsg} -eq 0 ]] ; then
1344 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1478 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1345 if [[ -z ${CDROM_NAME} ]] ; then 1479 if [[ -z ${CDROM_NAME} ]] ; then
1346 einfo "Please insert the cdrom for ${PN} now !" 1480 einfo "Please insert+mount the cdrom for ${PN} now !"
1347 else
1348 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1349 fi
1350 else 1481 else
1351 if [[ -z ${CDROM_NAME_1} ]] ; then
1352 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1353 else
1354 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1355 einfo "Please insert+mount the ${!var} cdrom now !" 1482 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1356 fi
1357 fi 1483 fi
1358 showedmsg=1 1484 else
1485 if [[ -z ${CDROM_NAME_1} ]] ; then
1486 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1487 else
1488 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1489 einfo "Please insert+mount the ${!var} cdrom now !"
1490 fi
1359 fi 1491 fi
1492 showedmsg=1
1493 fi
1360 einfo "Press return to scan for the cd again" 1494 einfo "Press return to scan for the cd again"
1361 einfo "or hit CTRL+C to abort the emerge." 1495 einfo "or hit CTRL+C to abort the emerge."
1362 echo 1496 echo
1363 einfo "If you are having trouble with the detection" 1497 einfo "If you are having trouble with the detection"
1364 einfo "of your CD, it is possible that you do not have" 1498 einfo "of your CD, it is possible that you do not have"
1365 einfo "Joliet support enabled in your kernel. Please" 1499 einfo "Joliet support enabled in your kernel. Please"
1366 einfo "check that CONFIG_JOLIET is enabled in your kernel." 1500 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1367 read 1501 read || die "something is screwed with your system"
1368 fi
1369 done 1502 done
1370} 1503}
1371 1504
1372# Make sure that LINGUAS only contains languages that 1505# Make sure that LINGUAS only contains languages that
1373# a package can support 1506# a package can support
1374# 1507#
1375# usage: strip-linguas <allow LINGUAS> 1508# usage: strip-linguas <allow LINGUAS>
1376# strip-linguas -i <directories of .po files> 1509# strip-linguas -i <directories of .po files>
1377# strip-linguas -u <directories of .po files> 1510# strip-linguas -u <directories of .po files>
1378# 1511#
1379# The first form allows you to specify a list of LINGUAS. 1512# The first form allows you to specify a list of LINGUAS.
1380# The -i builds a list of po files found in all the 1513# The -i builds a list of po files found in all the
1381# directories and uses the intersection of the lists. 1514# directories and uses the intersection of the lists.
1382# The -u builds a list of po files found in all the 1515# The -u builds a list of po files found in all the
1383# directories and uses the union of the lists. 1516# directories and uses the union of the lists.
1384strip-linguas() { 1517strip-linguas() {
1385 local ls newls 1518 local ls newls nols
1386 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1519 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1387 local op=$1; shift 1520 local op=$1; shift
1388 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1521 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1389 local d f 1522 local d f
1390 for d in "$@" ; do 1523 for d in "$@" ; do
1391 if [[ ${op} == "-u" ]] ; then 1524 if [[ ${op} == "-u" ]] ; then
1392 newls=${ls} 1525 newls=${ls}
1393 else 1526 else
1394 newls="" 1527 newls=""
1395 fi 1528 fi
1396 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1529 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1397 if [[ ${op} == "-i" ]] ; then 1530 if [[ ${op} == "-i" ]] ; then
1398 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1531 hasq ${f} ${ls} && newls="${newls} ${f}"
1399 else 1532 else
1400 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1533 hasq ${f} ${ls} || newls="${newls} ${f}"
1401 fi 1534 fi
1402 done 1535 done
1403 ls=${newls} 1536 ls=${newls}
1404 done 1537 done
1405 ls=${ls//.po}
1406 else 1538 else
1407 ls=$@ 1539 ls="$@"
1408 fi 1540 fi
1409 1541
1410 ls=" ${ls} " 1542 nols=""
1411 newls="" 1543 newls=""
1412 for f in ${LINGUAS} ; do 1544 for f in ${LINGUAS} ; do
1413 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1545 if hasq ${f} ${ls} ; then
1414 newls="${newls} ${f}" 1546 newls="${newls} ${f}"
1415 else 1547 else
1416 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1548 nols="${nols} ${f}"
1417 fi 1549 fi
1418 done 1550 done
1419 if [[ -z ${newls} ]] ; then 1551 [[ -n ${nols} ]] \
1420 export LINGUAS="" 1552 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1421 else
1422 export LINGUAS=${newls:1} 1553 export LINGUAS=${newls:1}
1423 fi
1424} 1554}
1425 1555
1426# moved from kernel.eclass since they are generally useful outside of 1556# moved from kernel.eclass since they are generally useful outside of
1427# kernel.eclass -iggy (20041002) 1557# kernel.eclass -iggy (20041002)
1428 1558
1435 while ((i--)) ; do 1565 while ((i--)) ; do
1436 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1566 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1437 done 1567 done
1438 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1568 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1439 case ${ARCH} in 1569 case ${ARCH} in
1440 x86) export ARCH="i386";; 1570 x86) export ARCH="i386";;
1441 amd64) export ARCH="x86_64";; 1571 amd64) export ARCH="x86_64";;
1442 hppa) export ARCH="parisc";; 1572 hppa) export ARCH="parisc";;
1443 mips) export ARCH="mips";; 1573 mips) export ARCH="mips";;
1444 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! 1574 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!
1445 *) export ARCH="${ARCH}";; 1575 *) export ARCH="${ARCH}";;
1446 esac 1576 esac
1447} 1577}
1448 1578
1449# set's ARCH back to what portage expects 1579# set's ARCH back to what portage expects
1450set_arch_to_portage() { 1580set_arch_to_portage() {
1457 1587
1458# Jeremy Huddleston <eradicator@gentoo.org>: 1588# Jeremy Huddleston <eradicator@gentoo.org>:
1459# preserve_old_lib /path/to/libblah.so.0 1589# preserve_old_lib /path/to/libblah.so.0
1460# preserve_old_lib_notify /path/to/libblah.so.0 1590# preserve_old_lib_notify /path/to/libblah.so.0
1461# 1591#
1462# These functions are useful when a lib in your package changes --soname. Such 1592# These functions are useful when a lib in your package changes --library. Such
1463# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1593# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1464# would break packages that link against it. Most people get around this 1594# would break packages that link against it. Most people get around this
1465# by using the portage SLOT mechanism, but that is not always a relevant 1595# by using the portage SLOT mechanism, but that is not always a relevant
1466# solution, so instead you can add the following to your ebuilds: 1596# solution, so instead you can add the following to your ebuilds:
1467# 1597#
1468# src_install() { 1598# pkg_preinst() {
1469# ... 1599# ...
1470# preserve_old_lib /usr/$(get_libdir)/libogg.so.0 1600# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1471# ... 1601# ...
1472# } 1602# }
1473# 1603#
1476# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0 1606# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1477# ... 1607# ...
1478# } 1608# }
1479 1609
1480preserve_old_lib() { 1610preserve_old_lib() {
1481 LIB=$1 1611 if [[ ${EBUILD_PHASE} != "preinst" ]] ; then
1612 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1613 die "Invalid preserve_old_lib() usage"
1614 fi
1615 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1482 1616
1483 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1617 local lib dir
1484 SONAME=`basename ${LIB}` 1618 for lib in "$@" ; do
1485 DIRNAME=`dirname ${LIB}` 1619 [[ -e ${ROOT}/${lib} ]] || continue
1486 1620 dir=${lib%/*}
1487 dodir ${DIRNAME} 1621 dodir ${dir} || die "dodir ${dir} failed"
1488 cp ${ROOT}${LIB} ${D}${DIRNAME} 1622 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
1489 touch ${D}${LIB} 1623 touch "${D}"/${lib}
1490 fi 1624 done
1491} 1625}
1492 1626
1493preserve_old_lib_notify() { 1627preserve_old_lib_notify() {
1494 LIB=$1 1628 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1629 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1630 die "Invalid preserve_old_lib_notify() usage"
1631 fi
1495 1632
1496 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1633 local lib notice=0
1497 SONAME=`basename ${LIB}` 1634 for lib in "$@" ; do
1498 1635 [[ -e ${ROOT}/${lib} ]] || continue
1636 if [[ ${notice} -eq 0 ]] ; then
1637 notice=1
1499 ewarn "An old version of an installed library was detected on your system." 1638 ewarn "Old versions of installed libraries were detected on your system."
1500 ewarn "In order to avoid breaking packages that link against it, this older version" 1639 ewarn "In order to avoid breaking packages that depend on these old libs,"
1501 ewarn "is not being removed. In order to make full use of this newer version," 1640 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1502 ewarn "you will need to execute the following command:" 1641 ewarn "in order to remove these old dependencies. If you do not have this"
1503 ewarn " revdep-rebuild --soname ${SONAME}" 1642 ewarn "helper program, simply emerge the 'gentoolkit' package."
1504 ewarn 1643 ewarn
1505 ewarn "After doing that, you can safely remove ${LIB}"
1506 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1507 fi 1644 fi
1645 ewarn " # revdep-rebuild --library ${lib##*/}"
1646 done
1508} 1647}
1509 1648
1510# Hack for people to figure out if a package was built with 1649# Hack for people to figure out if a package was built with
1511# certain USE flags 1650# certain USE flags
1512# 1651#
1513# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1652# Usage: built_with_use [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1514# ex: built_with_use xchat gtk2 1653# ex: built_with_use xchat gtk2
1515# 1654#
1516# Flags: -a all USE flags should be utilized 1655# Flags: -a all USE flags should be utilized
1517# -o at least one USE flag should be utilized 1656# -o at least one USE flag should be utilized
1657# --missing peform the specified action if the flag is not in IUSE (true/false/die)
1658# --hidden USE flag we're checking is hidden expanded so it isnt in IUSE
1518# Note: the default flag is '-a' 1659# Note: the default flag is '-a'
1519built_with_use() { 1660built_with_use() {
1661 local hidden="no"
1662 if [[ $1 == "--hidden" ]] ; then
1663 hidden="yes"
1664 shift
1665 fi
1666
1667 local missing_action="die"
1668 if [[ $1 == "--missing" ]] ; then
1669 missing_action=$2
1670 shift ; shift
1671 case ${missing_action} in
1672 true|false|die) ;;
1673 *) die "unknown action '${missing_action}'";;
1674 esac
1675 fi
1676
1520 local opt=$1 1677 local opt=$1
1521 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1678 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1522 1679
1523 local PKG=$(best_version $1) 1680 local PKG=$(best_version $1)
1681 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1524 shift 1682 shift
1525 1683
1526 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1684 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1527 [[ ! -e ${USEFILE} ]] && return 1 1685 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1686
1687 # if the IUSE file doesn't exist, the read will error out, we need to handle
1688 # this gracefully
1689 if [[ ! -e ${USEFILE} ]] || [[ ! -e ${IUSEFILE} && ${hidden} == "no" ]] ; then
1690 case ${missing_action} in
1691 true) return 0;;
1692 false) return 1;;
1693 die) die "Unable to determine what USE flags $PKG was built with";;
1694 esac
1695 fi
1696
1697 if [[ ${hidden} == "no" ]] ; then
1698 local IUSE_BUILT=$(<${IUSEFILE})
1699 # Don't check USE_EXPAND #147237
1700 local expand
1701 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1702 if [[ $1 == ${expand}_* ]] ; then
1703 expand=""
1704 break
1705 fi
1706 done
1707 if [[ -n ${expand} ]] ; then
1708 if ! has $1 ${IUSE_BUILT} ; then
1709 case ${missing_action} in
1710 true) return 0;;
1711 false) return 1;;
1712 die) die "$PKG does not actually support the $1 USE flag!";;
1713 esac
1714 fi
1715 fi
1716 fi
1528 1717
1529 local USE_BUILT=$(<${USEFILE}) 1718 local USE_BUILT=$(<${USEFILE})
1530 while [[ $# -gt 0 ]] ; do 1719 while [[ $# -gt 0 ]] ; do
1531 if [[ ${opt} = "-o" ]] ; then 1720 if [[ ${opt} = "-o" ]] ; then
1532 has $1 ${USE_BUILT} && return 0 1721 has $1 ${USE_BUILT} && return 0
1547 local f 1736 local f
1548 for f in $(find ${dir} -name configure) ; do 1737 for f in $(find ${dir} -name configure) ; do
1549 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1738 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1550 done 1739 done
1551 eend 0 1740 eend 0
1552}
1553
1554# dopamd <file> [more files]
1555#
1556# Install pam auth config file in /etc/pam.d
1557dopamd() {
1558 [[ -z $1 ]] && die "dopamd requires at least one argument"
1559
1560 use pam || return 0
1561
1562 INSDESTTREE=/etc/pam.d \
1563 doins "$@" || die "failed to install $@"
1564}
1565# newpamd <old name> <new name>
1566#
1567# Install pam file <old name> as <new name> in /etc/pam.d
1568newpamd() {
1569 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1570
1571 use pam || return 0
1572
1573 INSDESTTREE=/etc/pam.d \
1574 newins "$1" "$2" || die "failed to install $1 as $2"
1575} 1741}
1576 1742
1577# make a wrapper script ... 1743# make a wrapper script ...
1578# NOTE: this was originally games_make_wrapper, but I noticed other places where 1744# NOTE: this was originally games_make_wrapper, but I noticed other places where
1579# this could be used, so I have moved it here and made it not games-specific 1745# this could be used, so I have moved it here and made it not games-specific
1584# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1750# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1585# $5 == path for wrapper 1751# $5 == path for wrapper
1586make_wrapper() { 1752make_wrapper() {
1587 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1753 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1588 local tmpwrapper=$(emktemp) 1754 local tmpwrapper=$(emktemp)
1755 # We don't want to quote ${bin} so that people can pass complex
1756 # things as $bin ... "./someprog --args"
1589 cat << EOF > "${tmpwrapper}" 1757 cat << EOF > "${tmpwrapper}"
1590#!/bin/sh 1758#!/bin/sh
1591cd "${chdir}" 1759cd "${chdir:-.}"
1760if [ -n "${libdir}" ] ; then
1761 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1592export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1762 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1763 else
1764 export LD_LIBRARY_PATH="${libdir}"
1765 fi
1766fi
1593exec ${bin} "\$@" 1767exec ${bin} "\$@"
1594EOF 1768EOF
1595 chmod go+rx "${tmpwrapper}" 1769 chmod go+rx "${tmpwrapper}"
1596 if [ -n "${5}" ] 1770 if [[ -n ${path} ]] ; then
1597 then
1598 exeinto ${5} 1771 exeinto "${path}"
1599 newexe "${tmpwrapper}" "${wrapper}" 1772 newexe "${tmpwrapper}" "${wrapper}"
1600 else 1773 else
1601 newbin "${tmpwrapper}" "${wrapper}" 1774 newbin "${tmpwrapper}" "${wrapper}"
1602 fi 1775 fi
1603} 1776}

Legend:
Removed from v.1.192  
changed lines
  Added in v.1.278

  ViewVC Help
Powered by ViewVC 1.1.20