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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20