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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.182  
changed lines
  Added in v.1.281

  ViewVC Help
Powered by ViewVC 1.1.20