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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.211  
changed lines
  Added in v.1.284

  ViewVC Help
Powered by ViewVC 1.1.20