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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.212  
changed lines
  Added in v.1.283

  ViewVC Help
Powered by ViewVC 1.1.20