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

Diff of /eclass/eutils.eclass

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

Revision 1.167 Revision 1.228
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2005 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.167 2005/04/16 07:05:45 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.228 2006/03/10 23:24:21 vapier Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib 12inherit multilib portability
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15 13
16DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 16
18DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
19 18
20# Wait for the supplied number of seconds. If no argument is supplied, defaults 19# Wait for the supplied number of seconds. If no argument is supplied, defaults
21# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
61# to point to the latest version of the library present. 60# to point to the latest version of the library present.
62# 61#
63# <azarah@gentoo.org> (26 Oct 2002) 62# <azarah@gentoo.org> (26 Oct 2002)
64# 63#
65gen_usr_ldscript() { 64gen_usr_ldscript() {
66 local libdir="$(get_libdir)" 65 local lib libdir=$(get_libdir)
67 # Just make sure it exists 66 # Just make sure it exists
68 dodir /usr/${libdir} 67 dodir /usr/${libdir}
69 68
70 for lib in "${@}" ; do 69 for lib in "${@}" ; do
71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
72 /* GNU ld script 71 /* GNU ld script
73 Since Gentoo has critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
74 in /lib, and the static versions in /usr/lib, 73 in /lib, and the static versions in /usr/lib,
75 we need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
76 otherwise we run into linking problems. 75 otherwise we run into linking problems.
77 76
78 See bug http://bugs.gentoo.org/4411 for more info. 77 See bug http://bugs.gentoo.org/4411 for more info.
79 */ 78 */
80 GROUP ( /${libdir}/${lib} ) 79 GROUP ( /${libdir}/${lib} )
81 END_LDSCRIPT 80 END_LDSCRIPT
82 fperms a+x "/usr/${libdir}/${lib}" 81 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
83 done 82 done
84} 83}
85 84
86# Simple function to draw a line consisting of '=' the same length as $*
87# - only to be used by epatch()
88#
89# <azarah@gentoo.org> (11 Nov 2002)
90#
91draw_line() {
92 local i=0
93 local str_length=""
94
95 # Handle calls that do not have args, or wc not being installed ...
96 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
97 then
98 echo "==============================================================="
99 return 0
100 fi
101
102 # Get the length of $*
103 str_length="$(echo -n "$*" | wc -m)"
104
105 while [ "$i" -lt "${str_length}" ]
106 do
107 echo -n "="
108
109 i=$((i + 1))
110 done
111
112 echo
113
114 return 0
115}
116 85
117# Default directory where patches are located 86# Default directory where patches are located
118EPATCH_SOURCE="${WORKDIR}/patch" 87EPATCH_SOURCE="${WORKDIR}/patch"
119# Default extension for patches 88# Default extension for patches
120EPATCH_SUFFIX="patch.bz2" 89EPATCH_SUFFIX="patch.bz2"
121# Default options for patch 90# Default options for patch
122# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 91# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
123EPATCH_OPTS="-g0" 92# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
93EPATCH_OPTS="-g0 --no-backup-if-mismatch"
124# List of patches not to apply. Not this is only file names, 94# List of patches not to apply. Not this is only file names,
125# and not the full path .. 95# and not the full path ..
126EPATCH_EXCLUDE="" 96EPATCH_EXCLUDE=""
127# Change the printed message for a single patch. 97# Change the printed message for a single patch.
128EPATCH_SINGLE_MSG="" 98EPATCH_SINGLE_MSG=""
99# Change the printed message for multiple patches.
100EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
129# Force applying bulk patches even if not following the style: 101# Force applying bulk patches even if not following the style:
130# 102#
131# ??_${ARCH}_foo.${EPATCH_SUFFIX} 103# ??_${ARCH}_foo.${EPATCH_SUFFIX}
132# 104#
133EPATCH_FORCE="no" 105EPATCH_FORCE="no"
164# hand its a directory, it will set EPATCH_SOURCE to this. 136# hand its a directory, it will set EPATCH_SOURCE to this.
165# 137#
166# <azarah@gentoo.org> (10 Nov 2002) 138# <azarah@gentoo.org> (10 Nov 2002)
167# 139#
168epatch() { 140epatch() {
141 _epatch_draw_line() {
142 # this func produces a lot of pointless noise when debugging is turned on ...
143 local is_debug=0
144 [[ $- == *x* ]] && is_debug=1 && set +x
145
146 local i=0 str_length="" str_out=""
147
148 # Handle calls that do not have args, or wc not being installed ...
149 if [[ -z $1 ]] || ! type -p wc >/dev/null ; then
150 str_length=65
151 else
152 str_length=$(echo -n "$*" | wc -m)
153 fi
154
155 while ((i++ < ${str_length})) ; do
156 str_out="${str_out}="
157 done
158 echo ${str_out}
159
160 [[ ${is_debug} -eq 1 ]] && set -x
161 return 0
162 }
163 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
169 local PIPE_CMD="" 164 local PIPE_CMD=""
170 local STDERR_TARGET="${T}/$$.out" 165 local STDERR_TARGET="${T}/$$.out"
171 local PATCH_TARGET="${T}/$$.patch" 166 local PATCH_TARGET="${T}/$$.patch"
172 local PATCH_SUFFIX="" 167 local PATCH_SUFFIX=""
173 local SINGLE_PATCH="no" 168 local SINGLE_PATCH="no"
174 local x="" 169 local x=""
175 170
171 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
172
176 if [ "$#" -gt 1 ] 173 if [ "$#" -gt 1 ]
177 then 174 then
178 local m="" 175 local m=""
179 einfo "${#} patches to apply ..."
180 for m in "$@" ; do 176 for m in "$@" ; do
181 epatch "${m}" 177 epatch "${m}"
182 done 178 done
183 return 0 179 return 0
184 fi 180 fi
238 ;; 234 ;;
239 esac 235 esac
240 236
241 if [ "${SINGLE_PATCH}" = "no" ] 237 if [ "${SINGLE_PATCH}" = "no" ]
242 then 238 then
243 einfo "Applying various patches (bugfixes/updates) ..." 239 einfo "${EPATCH_MULTI_MSG}"
244 fi 240 fi
245 for x in ${EPATCH_SOURCE} 241 for x in ${EPATCH_SOURCE}
246 do 242 do
247 # New ARCH dependant patch naming scheme ... 243 # New ARCH dependant patch naming scheme ...
248 # 244 #
249 # ???_arch_foo.patch 245 # ???_arch_foo.patch
250 # 246 #
251 if [ -f ${x} ] && \ 247 if [ -f ${x} ] && \
252 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 248 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
253 [ "${EPATCH_FORCE}" = "yes" ]) 249 [ "${EPATCH_FORCE}" = "yes" ])
254 then 250 then
255 local count=0 251 local count=0
256 local popts="${EPATCH_OPTS}" 252 local popts="${EPATCH_OPTS}"
257 local patchname=${x##*/} 253 local patchname=${x##*/}
281 277
282 # Allow for prefix to differ ... im lazy, so shoot me :/ 278 # Allow for prefix to differ ... im lazy, so shoot me :/
283 while [ "${count}" -lt 5 ] 279 while [ "${count}" -lt 5 ]
284 do 280 do
285 # Generate some useful debug info ... 281 # Generate some useful debug info ...
286 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
287 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
288 284
289 if [ "${PATCH_SUFFIX}" != "patch" ] 285 if [ "${PATCH_SUFFIX}" != "patch" ]
290 then 286 then
291 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 287 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
296 292
297 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 293 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
298 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 294 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
299 295
300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 296 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 297 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 298
303 if [ "${PATCH_SUFFIX}" != "patch" ] 299 if [ "${PATCH_SUFFIX}" != "patch" ]
304 then 300 then
305 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 301 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
306 then 302 then
310 count=5 306 count=5
311 break 307 break
312 fi 308 fi
313 fi 309 fi
314 310
315 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 311 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
316 then 312 then
317 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 313 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
318 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 314 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
319 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 315 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 316 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 317 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 318
323 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 319 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
320 _epatch_assert
324 321
325 if [ "$?" -ne 0 ] 322 if [ "$?" -ne 0 ]
326 then 323 then
327 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 324 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
328 echo 325 echo
367 then 364 then
368 einfo "Done with patching" 365 einfo "Done with patching"
369 fi 366 fi
370} 367}
371 368
372# This function return true if we are using the NPTL pthreads
373# implementation.
374#
375# <azarah@gentoo.org> (06 March 2003)
376#
377have_NPTL() {
378 cat > ${T}/test-nptl.c <<-"END"
379 #define _XOPEN_SOURCE
380 #include <unistd.h>
381 #include <stdio.h>
382
383 int main()
384 {
385 char buf[255];
386 char *str = buf;
387
388 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
389 if (NULL != str) {
390 printf("%s\n", str);
391 if (NULL != strstr(str, "NPTL"))
392 return 0;
393 }
394
395 return 1;
396 }
397 END
398
399 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
400 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
401 then
402 echo "yes"
403 einfon "Checking what PTHREADS implementation we have ..."
404 if ${T}/nptl
405 then
406 return 0
407 else
408 return 1
409 fi
410 else
411 echo "no"
412 fi
413
414 return 1
415}
416
417# This function check how many cpu's are present, and then set
418# -j in MAKEOPTS accordingly.
419#
420# Thanks to nall <nall@gentoo.org> for this.
421#
422get_number_of_jobs() {
423 local jobs=0
424
425 if [ ! -r /proc/cpuinfo ]
426 then
427 return 1
428 fi
429
430 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
431 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
432 then
433 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
434 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
435 ADMINPARAM="${ADMINPARAM/-j}"
436 fi
437
438 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
439
440 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
441 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
442 then
443 # these archs will always have "[Pp]rocessor"
444 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
445
446 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
447 then
448 # sparc always has "ncpus active"
449 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
450
451 elif [ "${ARCH}" = "alpha" ]
452 then
453 # alpha has "cpus active", but only when compiled with SMP
454 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
455 then
456 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
457 else
458 jobs=2
459 fi
460
461 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
462 then
463 # ppc has "processor", but only when compiled with SMP
464 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
465 then
466 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
467 else
468 jobs=2
469 fi
470 elif [ "${ARCH}" = "s390" ]
471 then
472 # s390 has "# processors : "
473 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
474 else
475 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
476 die "Unknown ARCH -- ${ARCH}!"
477 fi
478
479 # Make sure the number is valid ...
480 if [ "${jobs}" -lt 1 ]
481 then
482 jobs=1
483 fi
484
485 if [ -n "${ADMINPARAM}" ]
486 then
487 if [ "${jobs}" -gt "${ADMINPARAM}" ]
488 then
489 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
490 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
491 else
492 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
493 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
494 fi
495 fi
496}
497
498# Cheap replacement for when debianutils (and thus mktemp) 369# Cheap replacement for when debianutils (and thus mktemp)
499# does not exist on the users system 370# does not exist on the users system
500# vapier@gentoo.org 371# vapier@gentoo.org
501# 372#
502# Takes just 1 optional parameter (the directory to create tmpfile in) 373# Takes just 1 optional parameter (the directory to create tmpfile in)
503emktemp() { 374emktemp() {
504 local exe="touch" 375 local exe="touch"
505 [ "$1" == "-d" ] && exe="mkdir" && shift 376 [[ $1 == -d ]] && exe="mkdir" && shift
506 local topdir="$1" 377 local topdir=$1
507 378
508 if [ -z "${topdir}" ] 379 if [[ -z ${topdir} ]] ; then
509 then
510 [ -z "${T}" ] \ 380 [[ -z ${T} ]] \
511 && topdir="/tmp" \ 381 && topdir="/tmp" \
512 || topdir="${T}" 382 || topdir=${T}
513 fi 383 fi
514 384
515 if [ -z "$(type -p mktemp)" ] 385 if [[ -z $(type -p mktemp) ]] ; then
516 then
517 local tmp=/ 386 local tmp=/
518 while [ -e "${tmp}" ] ; do 387 while [[ -e ${tmp} ]] ; do
519 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 388 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
520 done 389 done
521 ${exe} "${tmp}" 390 ${exe} "${tmp}" || ${exe} -p "${tmp}"
522 echo "${tmp}" 391 echo "${tmp}"
523 else 392 else
524 [ "${exe}" == "touch" ] \ 393 if [[ ${exe} == "touch" ]] ; then
525 && exe="-p" \ 394 [[ ${USERLAND} == "GNU" ]] \
526 || exe="-d" 395 && mktemp -p "${topdir}" \
527 mktemp ${exe} "${topdir}" 396 || TMPDIR="${topdir}" mktemp -t tmp
397 else
398 [[ ${USERLAND} == "GNU" ]] \
399 && mktemp -d "${topdir}" \
400 || TMPDIR="${topdir}" mktemp -dt tmp
401 fi
528 fi 402 fi
529} 403}
530 404
531# Small wrapper for getent (Linux), nidump (Mac OS X), 405# Small wrapper for getent (Linux), nidump (Mac OS X),
532# and pw (FreeBSD) used in enewuser()/enewgroup() 406# and pw (FreeBSD) used in enewuser()/enewgroup()
533# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 407# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
534# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 408# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
535# 409#
536# egetent(database, key) 410# egetent(database, key)
537egetent() { 411egetent() {
538 if useq ppc-macos ; then 412 case ${CHOST} in
413 *-darwin*)
539 case "$2" in 414 case "$2" in
540 *[!0-9]*) # Non numeric 415 *[!0-9]*) # Non numeric
541 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
542 ;; 417 ;;
543 *) # Numeric 418 *) # Numeric
544 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
545 ;; 420 ;;
546 esac 421 esac
547 elif useq x86-fbsd ; then 422 ;;
548 local action 423 *-freebsd*|*-dragonfly*)
549 if [ "$1" == "passwd" ] 424 local opts action="user"
550 then 425 [[ $1 == "passwd" ]] || action="group"
551 action="user" 426
552 else 427 # lookup by uid/gid
553 action="group" 428 if [[ $2 == [[:digit:]]* ]] ; then
429 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
554 fi 430 fi
431
555 pw show "${action}" "$2" -q 432 pw show ${action} ${opts} "$2" -q
556 else 433 ;;
434 *-netbsd*|*-openbsd*)
435 grep "$2:\*:" /etc/$1
436 ;;
437 *)
557 which nscd >& /dev/null && nscd -i "$1" 438 type -p nscd >& /dev/null && nscd -i "$1"
558 getent "$1" "$2" 439 getent "$1" "$2"
559 fi 440 ;;
441 esac
560} 442}
561 443
562# Simplify/standardize adding users to the system 444# Simplify/standardize adding users to the system
563# vapier@gentoo.org 445# vapier@gentoo.org
564# 446#
572# homedir: /dev/null 454# homedir: /dev/null
573# groups: none 455# groups: none
574# extra: comment of 'added by portage for ${PN}' 456# extra: comment of 'added by portage for ${PN}'
575enewuser() { 457enewuser() {
576 # get the username 458 # get the username
577 local euser="$1"; shift 459 local euser=$1; shift
578 if [ -z "${euser}" ] 460 if [[ -z ${euser} ]] ; then
579 then
580 eerror "No username specified !" 461 eerror "No username specified !"
581 die "Cannot call enewuser without a username" 462 die "Cannot call enewuser without a username"
582 fi 463 fi
583 464
584 # lets see if the username already exists 465 # lets see if the username already exists
585 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 466 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
586 then
587 return 0 467 return 0
588 fi 468 fi
589 einfo "Adding user '${euser}' to your system ..." 469 einfo "Adding user '${euser}' to your system ..."
590 470
591 # options to pass to useradd 471 # options to pass to useradd
592 local opts= 472 local opts=
593 473
594 # handle uid 474 # handle uid
595 local euid="$1"; shift 475 local euid=$1; shift
596 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 476 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
597 then
598 if [ "${euid}" -gt 0 ] 477 if [[ ${euid} -gt 0 ]] ; then
599 then
600 if [ ! -z "`egetent passwd ${euid}`" ] 478 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
601 then
602 euid="next" 479 euid="next"
603 fi 480 fi
604 else 481 else
605 eerror "Userid given but is not greater than 0 !" 482 eerror "Userid given but is not greater than 0 !"
606 die "${euid} is not a valid UID" 483 die "${euid} is not a valid UID"
607 fi 484 fi
608 else 485 else
609 euid="next" 486 euid="next"
610 fi 487 fi
611 if [ "${euid}" == "next" ] 488 if [[ ${euid} == "next" ]] ; then
612 then 489 for euid in $(seq 101 999) ; do
613 local pwrange
614 if [ "${USERLAND}" == "BSD" ] ; then
615 pwrange="`jot 898 101`"
616 else
617 pwrange="`seq 101 999`"
618 fi
619 for euid in ${pwrange} ; do
620 [ -z "`egetent passwd ${euid}`" ] && break 490 [[ -z $(egetent passwd ${euid}) ]] && break
621 done 491 done
622 fi 492 fi
623 opts="${opts} -u ${euid}" 493 opts="${opts} -u ${euid}"
624 einfo " - Userid: ${euid}" 494 einfo " - Userid: ${euid}"
625 495
626 # handle shell 496 # handle shell
627 local eshell="$1"; shift 497 local eshell=$1; shift
628 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 498 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
629 then 499 if [[ ! -e ${ROOT}${eshell} ]] ; then
630 if [ ! -e "${eshell}" ]
631 then
632 eerror "A shell was specified but it does not exist !" 500 eerror "A shell was specified but it does not exist !"
633 die "${eshell} does not exist" 501 die "${eshell} does not exist in ${ROOT}"
634 fi 502 fi
635 else 503 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
636 if [ "${USERLAND}" == "BSD" ] 504 eerror "Do not specify ${eshell} yourself, use -1"
637 then 505 die "Pass '-1' as the shell parameter"
638 eshell="/usr/bin/false" 506 fi
639 else 507 else
640 eshell="/bin/false" 508 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
509 [[ -x ${ROOT}${shell} ]] && break
510 done
511
512 if [[ ${shell} == "/dev/null" ]] ; then
513 eerror "Unable to identify the shell to use"
514 die "Unable to identify the shell to use"
641 fi 515 fi
516
517 eshell=${shell}
642 fi 518 fi
643 einfo " - Shell: ${eshell}" 519 einfo " - Shell: ${eshell}"
644 opts="${opts} -s ${eshell}" 520 opts="${opts} -s ${eshell}"
645 521
646 # handle homedir 522 # handle homedir
647 local ehome="$1"; shift 523 local ehome=$1; shift
648 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 524 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
649 then
650 ehome="/dev/null" 525 ehome="/dev/null"
651 fi 526 fi
652 einfo " - Home: ${ehome}" 527 einfo " - Home: ${ehome}"
653 opts="${opts} -d ${ehome}" 528 opts="${opts} -d ${ehome}"
654 529
655 # handle groups 530 # handle groups
656 local egroups="$1"; shift 531 local egroups=$1; shift
657 if [ ! -z "${egroups}" ] 532 if [[ ! -z ${egroups} ]] ; then
658 then
659 local oldifs="${IFS}" 533 local oldifs=${IFS}
660 local defgroup="" exgroups="" 534 local defgroup="" exgroups=""
661 535
662 export IFS="," 536 export IFS=","
663 for g in ${egroups} 537 for g in ${egroups} ; do
664 do
665 export IFS="${oldifs}" 538 export IFS=${oldifs}
666 if [ -z "`egetent group \"${g}\"`" ] 539 if [[ -z $(egetent group "${g}") ]] ; then
667 then
668 eerror "You must add group ${g} to the system first" 540 eerror "You must add group ${g} to the system first"
669 die "${g} is not a valid GID" 541 die "${g} is not a valid GID"
670 fi 542 fi
671 if [ -z "${defgroup}" ] 543 if [[ -z ${defgroup} ]] ; then
672 then
673 defgroup="${g}" 544 defgroup=${g}
674 else 545 else
675 exgroups="${exgroups},${g}" 546 exgroups="${exgroups},${g}"
676 fi 547 fi
677 export IFS="," 548 export IFS=","
678 done 549 done
679 export IFS="${oldifs}" 550 export IFS=${oldifs}
680 551
681 opts="${opts} -g ${defgroup}" 552 opts="${opts} -g ${defgroup}"
682 if [ ! -z "${exgroups}" ] 553 if [[ ! -z ${exgroups} ]] ; then
683 then
684 opts="${opts} -G ${exgroups:1}" 554 opts="${opts} -G ${exgroups:1}"
685 fi 555 fi
686 else 556 else
687 egroups="(none)" 557 egroups="(none)"
688 fi 558 fi
689 einfo " - Groups: ${egroups}" 559 einfo " - Groups: ${egroups}"
690 560
691 # handle extra and add the user 561 # handle extra and add the user
692 local eextra="$@"
693 local oldsandbox="${SANDBOX_ON}" 562 local oldsandbox=${SANDBOX_ON}
694 export SANDBOX_ON="0" 563 export SANDBOX_ON="0"
695 if useq ppc-macos 564 case ${CHOST} in
696 then 565 *-darwin*)
697 ### Make the user 566 ### Make the user
698 if [ -z "${eextra}" ] 567 if [[ -z $@ ]] ; then
699 then
700 dscl . create /users/${euser} uid ${euid} 568 dscl . create /users/${euser} uid ${euid}
701 dscl . create /users/${euser} shell ${eshell} 569 dscl . create /users/${euser} shell ${eshell}
702 dscl . create /users/${euser} home ${ehome} 570 dscl . create /users/${euser} home ${ehome}
703 dscl . create /users/${euser} realname "added by portage for ${PN}" 571 dscl . create /users/${euser} realname "added by portage for ${PN}"
704 ### Add the user to the groups specified 572 ### Add the user to the groups specified
705 local oldifs="${IFS}" 573 local oldifs=${IFS}
706 export IFS="," 574 export IFS=","
707 for g in ${egroups} 575 for g in ${egroups} ; do
708 do
709 dscl . merge /groups/${g} users ${euser} 576 dscl . merge /groups/${g} users ${euser}
710 done 577 done
711 export IFS="${oldifs}" 578 export IFS=${oldifs}
712 else 579 else
713 einfo "Extra options are not supported on macos yet" 580 einfo "Extra options are not supported on Darwin yet"
714 einfo "Please report the ebuild along with the info below" 581 einfo "Please report the ebuild along with the info below"
715 einfo "eextra: ${eextra}" 582 einfo "eextra: $@"
716 die "Required function missing" 583 die "Required function missing"
717 fi 584 fi
718 elif use x86-fbsd ; then 585 ;;
719 if [ -z "${eextra}" ] 586 *-freebsd*|*-dragonfly*)
720 then 587 if [[ -z $@ ]] ; then
721 pw useradd ${euser} ${opts} \ 588 pw useradd ${euser} ${opts} \
722 -c "added by portage for ${PN}" \ 589 -c "added by portage for ${PN}" \
723 die "enewuser failed" 590 die "enewuser failed"
724 else 591 else
725 einfo " - Extra: ${eextra}" 592 einfo " - Extra: $@"
726 pw useradd ${euser} ${opts} \ 593 pw useradd ${euser} ${opts} \
727 -c ${eextra} || die "enewuser failed" 594 "$@" || die "enewuser failed"
728 fi 595 fi
596 ;;
597
598 *-netbsd*)
599 if [[ -z $@ ]] ; then
600 useradd ${opts} ${euser} || die "enewuser failed"
729 else 601 else
730 if [ -z "${eextra}" ] 602 einfo " - Extra: $@"
731 then 603 useradd ${opts} ${euser} "$@" || die "enewuser failed"
604 fi
605 ;;
606
607 *-openbsd*)
608 if [[ -z $@ ]] ; then
609 useradd -u ${euid} -s ${eshell} \
610 -d ${ehome} -c "Added by portage for ${PN}" \
611 -g ${egroups} ${euser} || die "enewuser failed"
612 else
613 einfo " - Extra: $@"
614 useradd -u ${euid} -s ${eshell} \
615 -d ${ehome} -c "Added by portage for ${PN}" \
616 -g ${egroups} ${euser} "$@" || die "enewuser failed"
617 fi
618 ;;
619
620 *)
621 if [[ -z $@ ]] ; then
732 useradd ${opts} ${euser} \ 622 useradd ${opts} ${euser} \
733 -c "added by portage for ${PN}" \ 623 -c "added by portage for ${PN}" \
734 || die "enewuser failed" 624 || die "enewuser failed"
735 else 625 else
736 einfo " - Extra: ${eextra}" 626 einfo " - Extra: $@"
737 useradd ${opts} ${euser} ${eextra} \ 627 useradd ${opts} ${euser} "$@" \
738 || die "enewuser failed" 628 || die "enewuser failed"
739 fi 629 fi
630 ;;
631 esac
632
633 if [[ ! -e ${ROOT}/${ehome} ]] ; then
634 einfo " - Creating ${ehome} in ${ROOT}"
635 mkdir -p "${ROOT}/${ehome}"
636 chown ${euser} "${ROOT}/${ehome}"
637 chmod 755 "${ROOT}/${ehome}"
740 fi 638 fi
639
741 export SANDBOX_ON="${oldsandbox}" 640 export SANDBOX_ON=${oldsandbox}
742
743 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
744 then
745 einfo " - Creating ${ehome} in ${D}"
746 dodir ${ehome}
747 fowners ${euser} ${ehome}
748 fperms 755 ${ehome}
749 fi
750} 641}
751 642
752# Simplify/standardize adding groups to the system 643# Simplify/standardize adding groups to the system
753# vapier@gentoo.org 644# vapier@gentoo.org
754# 645#
783 then 674 then
784 if [ "${egid}" -gt 0 ] 675 if [ "${egid}" -gt 0 ]
785 then 676 then
786 if [ -z "`egetent group ${egid}`" ] 677 if [ -z "`egetent group ${egid}`" ]
787 then 678 then
788 if useq ppc-macos ; then 679 if [[ "${CHOST}" == *-darwin* ]]; then
789 opts="${opts} ${egid}" 680 opts="${opts} ${egid}"
790 else 681 else
791 opts="${opts} -g ${egid}" 682 opts="${opts} -g ${egid}"
792 fi 683 fi
793 else 684 else
807 opts="${opts} ${eextra}" 698 opts="${opts} ${eextra}"
808 699
809 # add the group 700 # add the group
810 local oldsandbox="${SANDBOX_ON}" 701 local oldsandbox="${SANDBOX_ON}"
811 export SANDBOX_ON="0" 702 export SANDBOX_ON="0"
812 if useq ppc-macos ; then 703 case ${CHOST} in
704 *-darwin*)
813 if [ ! -z "${eextra}" ]; 705 if [ ! -z "${eextra}" ];
814 then 706 then
815 einfo "Extra options are not supported on macos yet" 707 einfo "Extra options are not supported on Darwin/OS X yet"
816 einfo "Please report the ebuild along with the info below" 708 einfo "Please report the ebuild along with the info below"
817 einfo "eextra: ${eextra}" 709 einfo "eextra: ${eextra}"
818 die "Required function missing" 710 die "Required function missing"
819 fi 711 fi
820 712
821 # If we need the next available 713 # If we need the next available
822 case ${egid} in 714 case ${egid} in
823 *[!0-9]*) # Non numeric 715 *[!0-9]*) # Non numeric
824 for egid in `jot 898 101`; do 716 for egid in $(seq 101 999); do
825 [ -z "`egetent group ${egid}`" ] && break 717 [ -z "`egetent group ${egid}`" ] && break
826 done 718 done
827 esac 719 esac
828 dscl . create /groups/${egroup} gid ${egid} 720 dscl . create /groups/${egroup} gid ${egid}
829 dscl . create /groups/${egroup} passwd '*' 721 dscl . create /groups/${egroup} passwd '*'
830 elif use x86-fbsd ; then 722 ;;
723
724 *-freebsd*|*-dragonfly*)
831 case ${egid} in 725 case ${egid} in
832 *[!0-9]*) # Non numeric 726 *[!0-9]*) # Non numeric
833 for egid in `jot 898 101`; do 727 for egid in $(seq 101 999); do
834 [ -z "`egetent group ${egid}`" ] && break 728 [ -z "`egetent group ${egid}`" ] && break
835 done 729 done
836 esac 730 esac
837 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 731 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
838 else 732 ;;
733
734 *-netbsd*)
735 case ${egid} in
736 *[!0-9]*) # Non numeric
737 for egid in $(seq 101 999); do
738 [ -z "`egetent group ${egid}`" ] && break
739 done
740 esac
741 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
742 ;;
743
744 *)
839 groupadd ${opts} ${egroup} || die "enewgroup failed" 745 groupadd ${opts} ${egroup} || die "enewgroup failed"
840 fi 746 ;;
747 esac
841 export SANDBOX_ON="${oldsandbox}" 748 export SANDBOX_ON="${oldsandbox}"
842} 749}
843 750
844# Simple script to replace 'dos2unix' binaries 751# Simple script to replace 'dos2unix' binaries
845# vapier@gentoo.org 752# vapier@gentoo.org
870# name: the name that will show up in the menu 777# name: the name that will show up in the menu
871# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
872# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
873# a full path to an icon 780# a full path to an icon
874# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
875# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 782# http://www.freedesktop.org/Standards/desktop-entry-spec
876# path: if your app needs to startup in a specific dir 783# path: if your app needs to startup in a specific dir
877make_desktop_entry() { 784make_desktop_entry() {
878 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 785 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
879 786
880 local exec=${1} 787 local exec=${1}
906 dev) 813 dev)
907 type="Development" 814 type="Development"
908 ;; 815 ;;
909 816
910 games) 817 games)
911 [[ -z ${path} ]] && path=${GAMES_BINDIR}
912
913 case ${catmin} in 818 case ${catmin} in
914 action) type=ActionGame;; 819 action) type=ActionGame;;
915 arcade) type=ArcadeGame;; 820 arcade) type=ArcadeGame;;
916 board) type=BoardGame;; 821 board) type=BoardGame;;
917 kid) type=KidsGame;; 822 kid) type=KidsGame;;
958 type="Network;${type}" 863 type="Network;${type}"
959 ;; 864 ;;
960 865
961 sci) 866 sci)
962 case ${catmin} in 867 case ${catmin} in
963 astro*) type=Astronomoy;; 868 astro*) type=Astronomy;;
964 bio*) type=Biology;; 869 bio*) type=Biology;;
965 calc*) type=Calculator;; 870 calc*) type=Calculator;;
966 chem*) type=Chemistry;; 871 chem*) type=Chemistry;;
967 geo*) type=Geology;; 872 geo*) type=Geology;;
968 math*) type=Math;; 873 math*) type=Math;;
982 *) 887 *)
983 type= 888 type=
984 ;; 889 ;;
985 esac 890 esac
986 fi 891 fi
987 892 if [ "${SLOT}" == "0" ] ; then
893 local desktop_name="${PN}"
894 else
895 local desktop_name="${PN}-${SLOT}"
896 fi
988 local desktop=${T}/${exec%% *}-${P}.desktop 897 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
989 898
990echo "[Desktop Entry] 899echo "[Desktop Entry]
991Encoding=UTF-8 900Encoding=UTF-8
992Version=0.9.2 901Version=0.9.2
993Name=${name} 902Name=${name}
996Exec=${exec} 905Exec=${exec}
997Path=${path} 906Path=${path}
998Icon=${icon} 907Icon=${icon}
999Categories=Application;${type};" > "${desktop}" 908Categories=Application;${type};" > "${desktop}"
1000 909
910 (
911 # wrap the env here so that the 'insinto' call
912 # doesn't corrupt the env of the caller
1001 insinto /usr/share/applications 913 insinto /usr/share/applications
1002 doins "${desktop}" 914 doins "${desktop}"
1003 915 )
1004 return 0
1005} 916}
1006 917
1007# Make a GDM/KDM Session file 918# Make a GDM/KDM Session file
1008# 919#
1009# make_desktop_entry(<title>, <command>) 920# make_desktop_entry(<title>, <command>)
1038 doins "${i}" 949 doins "${i}"
1039 elif [[ -d ${i} ]] ; then 950 elif [[ -d ${i} ]] ; then
1040 for j in "${i}"/*.desktop ; do 951 for j in "${i}"/*.desktop ; do
1041 doins "${j}" 952 doins "${j}"
1042 done 953 done
1043 fi 954 fi
1044 done 955 done
1045} 956}
1046newmenu() { 957newmenu() {
1047 insinto /usr/share/applications 958 insinto /usr/share/applications
1048 newins "$1" "$2" 959 newins "$1" "$2"
1056 doins "${i}" 967 doins "${i}"
1057 elif [[ -d ${i} ]] ; then 968 elif [[ -d ${i} ]] ; then
1058 for j in "${i}"/*.png ; do 969 for j in "${i}"/*.png ; do
1059 doins "${j}" 970 doins "${j}"
1060 done 971 done
1061 fi 972 fi
1062 done 973 done
1063} 974}
1064newicon() { 975newicon() {
1065 insinto /usr/share/pixmaps 976 insinto /usr/share/pixmaps
1066 newins "$1" "$2" 977 newins "$1" "$2"
1071############################################################## 982##############################################################
1072 983
1073 984
1074# for internal use only (unpack_pdv and unpack_makeself) 985# for internal use only (unpack_pdv and unpack_makeself)
1075find_unpackable_file() { 986find_unpackable_file() {
1076 local src="$1" 987 local src=$1
1077 if [ -z "${src}" ] 988 if [[ -z ${src} ]] ; then
1078 then
1079 src="${DISTDIR}/${A}" 989 src=${DISTDIR}/${A}
1080 else 990 else
1081 if [ -e "${DISTDIR}/${src}" ] 991 if [[ -e ${DISTDIR}/${src} ]] ; then
1082 then
1083 src="${DISTDIR}/${src}" 992 src=${DISTDIR}/${src}
1084 elif [ -e "${PWD}/${src}" ] 993 elif [[ -e ${PWD}/${src} ]] ; then
1085 then
1086 src="${PWD}/${src}" 994 src=${PWD}/${src}
1087 elif [ -e "${src}" ] 995 elif [[ -e ${src} ]] ; then
1088 then
1089 src="${src}" 996 src=${src}
1090 fi
1091 fi 997 fi
1092 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 998 fi
999 [[ ! -e ${src} ]] && return 1
1093 echo "${src}" 1000 echo "${src}"
1094} 1001}
1095 1002
1096# Unpack those pesky pdv generated files ... 1003# Unpack those pesky pdv generated files ...
1097# They're self-unpacking programs with the binary package stuffed in 1004# They're self-unpacking programs with the binary package stuffed in
1112# lseek 1019# lseek
1113# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1020# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1114# lseek(3, -4, SEEK_END) = 2981250 1021# lseek(3, -4, SEEK_END) = 2981250
1115# thus we would pass in the value of '4' as the second parameter. 1022# thus we would pass in the value of '4' as the second parameter.
1116unpack_pdv() { 1023unpack_pdv() {
1117 local src="`find_unpackable_file $1`" 1024 local src=$(find_unpackable_file $1)
1118 local sizeoff_t="$2" 1025 local sizeoff_t=$2
1119 1026
1027 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1120 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1028 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1121 1029
1122 local shrtsrc="`basename ${src}`" 1030 local shrtsrc=$(basename "${src}")
1123 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1031 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1124 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1032 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1125 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1033 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1126 1034
1127 # grab metadata for debug reasons 1035 # grab metadata for debug reasons
1191# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1099# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1192# - If the file is not specified then unpack will utilize ${A}. 1100# - If the file is not specified then unpack will utilize ${A}.
1193# - If the offset is not specified then we will attempt to extract 1101# - If the offset is not specified then we will attempt to extract
1194# the proper offset from the script itself. 1102# the proper offset from the script itself.
1195unpack_makeself() { 1103unpack_makeself() {
1104 local src_input=${1:-${A}}
1196 local src="$(find_unpackable_file "$1")" 1105 local src=$(find_unpackable_file "${src_input}")
1197 local skip="$2" 1106 local skip=$2
1198 local exe="$3" 1107 local exe=$3
1199 1108
1109 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1110
1200 local shrtsrc="$(basename "${src}")" 1111 local shrtsrc=$(basename "${src}")
1201 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1112 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1202 if [ -z "${skip}" ] 1113 if [[ -z ${skip} ]] ; then
1203 then
1204 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1114 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1205 local skip=0 1115 local skip=0
1206 exe=tail 1116 exe=tail
1207 case ${ver} in 1117 case ${ver} in
1208 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1118 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1209 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1119 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1221 ;; 1131 ;;
1222 2.1.3) 1132 2.1.3)
1223 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1133 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1224 let skip="skip + 1" 1134 let skip="skip + 1"
1225 ;; 1135 ;;
1226 2.1.4) 1136 2.1.4|2.1.5)
1227 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1137 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1228 skip=$(head -n ${skip} "${src}" | wc -c) 1138 skip=$(head -n ${skip} "${src}" | wc -c)
1229 exe="dd" 1139 exe="dd"
1230 ;; 1140 ;;
1231 *) 1141 *)
1276check_license() { 1186check_license() {
1277 local lic=$1 1187 local lic=$1
1278 if [ -z "${lic}" ] ; then 1188 if [ -z "${lic}" ] ; then
1279 lic="${PORTDIR}/licenses/${LICENSE}" 1189 lic="${PORTDIR}/licenses/${LICENSE}"
1280 else 1190 else
1281 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1191 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1282 lic="${PORTDIR}/licenses/${src}" 1192 lic="${PORTDIR}/licenses/${lic}"
1283 elif [ -e "${PWD}/${src}" ] ; then 1193 elif [ -e "${PWD}/${lic}" ] ; then
1284 lic="${PWD}/${src}" 1194 lic="${PWD}/${lic}"
1285 elif [ -e "${src}" ] ; then 1195 elif [ -e "${lic}" ] ; then
1286 lic="${src}" 1196 lic="${lic}"
1287 fi
1288 fi 1197 fi
1198 fi
1289 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1199 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1290 local l="`basename ${lic}`" 1200 local l="`basename ${lic}`"
1291 1201
1292 # here is where we check for the licenses the user already 1202 # here is where we check for the licenses the user already
1293 # accepted ... if we don't find a match, we make the user accept 1203 # accepted ... if we don't find a match, we make the user accept
1294 local shopts=$- 1204 local shopts=$-
1350 # first we figure out how many cds we're dealing with by 1260 # first we figure out how many cds we're dealing with by
1351 # the # of files they gave us 1261 # the # of files they gave us
1352 local cdcnt=0 1262 local cdcnt=0
1353 local f= 1263 local f=
1354 for f in "$@" ; do 1264 for f in "$@" ; do
1355 cdcnt=$((cdcnt + 1)) 1265 ((++cdcnt))
1356 export CDROM_CHECK_${cdcnt}="$f" 1266 export CDROM_CHECK_${cdcnt}="$f"
1357 done 1267 done
1358 export CDROM_TOTAL_CDS=${cdcnt} 1268 export CDROM_TOTAL_CDS=${cdcnt}
1359 export CDROM_CURRENT_CD=1 1269 export CDROM_CURRENT_CD=1
1360 1270
1361 # now we see if the user gave use CD_ROOT ... 1271 # now we see if the user gave use CD_ROOT ...
1362 # if they did, let's just believe them that it's correct 1272 # if they did, let's just believe them that it's correct
1363 if [[ ! -z ${CD_ROOT} ]] ; then
1364 export CDROM_ROOT=${CD_ROOT}
1365 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1366 return
1367 fi
1368 # do the same for CD_ROOT_X
1369 if [[ ! -z ${CD_ROOT_1} ]] ; then 1273 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1370 local var= 1274 local var=
1371 cdcnt=0 1275 cdcnt=0
1372 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1276 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1373 cdcnt=$((cdcnt + 1)) 1277 ((++cdcnt))
1374 var="CD_ROOT_${cdcnt}" 1278 var="CD_ROOT_${cdcnt}"
1279 [[ -z ${!var} ]] && var="CD_ROOT"
1375 if [[ -z ${!var} ]] ; then 1280 if [[ -z ${!var} ]] ; then
1376 eerror "You must either use just the CD_ROOT" 1281 eerror "You must either use just the CD_ROOT"
1377 eerror "or specify ALL the CD_ROOT_X variables." 1282 eerror "or specify ALL the CD_ROOT_X variables."
1378 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1283 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1379 die "could not locate CD_ROOT_${cdcnt}" 1284 die "could not locate CD_ROOT_${cdcnt}"
1380 fi 1285 fi
1381 export CDROM_ROOTS_${cdcnt}="${!var}"
1382 done 1286 done
1383 export CDROM_ROOT=${CDROM_ROOTS_1} 1287 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1384 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1288 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1289 export CDROM_SET=-1
1290 for f in ${CDROM_CHECK_1//:/ } ; do
1291 ((++CDROM_SET))
1292 [[ -e ${CD_ROOT}/${f} ]] && break
1293 done
1294 export CDROM_MATCH=${f}
1385 return 1295 return
1386 fi 1296 fi
1387 1297
1298 # User didn't help us out so lets make sure they know they can
1299 # simplify the whole process ...
1388 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1300 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1389 einfon "This ebuild will need the " 1301 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1390 if [[ -z ${CDROM_NAME} ]] ; then
1391 echo "cdrom for ${PN}."
1392 else
1393 echo "${CDROM_NAME}."
1394 fi
1395 echo 1302 echo
1396 einfo "If you do not have the CD, but have the data files" 1303 einfo "If you do not have the CD, but have the data files"
1397 einfo "mounted somewhere on your filesystem, just export" 1304 einfo "mounted somewhere on your filesystem, just export"
1398 einfo "the variable CD_ROOT so that it points to the" 1305 einfo "the variable CD_ROOT so that it points to the"
1399 einfo "directory containing the files." 1306 einfo "directory containing the files."
1403 echo 1310 echo
1404 else 1311 else
1405 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1312 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1406 cdcnt=0 1313 cdcnt=0
1407 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1314 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1408 cdcnt=$((cdcnt + 1)) 1315 ((++cdcnt))
1409 var="CDROM_NAME_${cdcnt}" 1316 var="CDROM_NAME_${cdcnt}"
1410 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1317 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1411 done 1318 done
1412 echo 1319 echo
1413 einfo "If you do not have the CDs, but have the data files" 1320 einfo "If you do not have the CDs, but have the data files"
1414 einfo "mounted somewhere on your filesystem, just export" 1321 einfo "mounted somewhere on your filesystem, just export"
1415 einfo "the following variables so they point to the right place:" 1322 einfo "the following variables so they point to the right place:"
1416 einfon "" 1323 einfon ""
1417 cdcnt=0 1324 cdcnt=0
1418 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1325 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1419 cdcnt=$((cdcnt + 1)) 1326 ((++cdcnt))
1420 echo -n " CD_ROOT_${cdcnt}" 1327 echo -n " CD_ROOT_${cdcnt}"
1421 done 1328 done
1422 echo 1329 echo
1423 einfo "Or, if you have all the files in the same place, or" 1330 einfo "Or, if you have all the files in the same place, or"
1424 einfo "you only have one cdrom, you can export CD_ROOT" 1331 einfo "you only have one cdrom, you can export CD_ROOT"
1427 echo 1334 echo
1428 einfo "For example:" 1335 einfo "For example:"
1429 einfo "export CD_ROOT_1=/mnt/cdrom" 1336 einfo "export CD_ROOT_1=/mnt/cdrom"
1430 echo 1337 echo
1431 fi 1338 fi
1339
1340 export CDROM_SET=""
1432 export CDROM_CURRENT_CD=0 1341 export CDROM_CURRENT_CD=0
1433 cdrom_load_next_cd 1342 cdrom_load_next_cd
1434} 1343}
1435 1344
1436# this is only used when you need access to more than one cd. 1345# this is only used when you need access to more than one cd.
1437# when you have finished using the first cd, just call this function. 1346# when you have finished using the first cd, just call this function.
1438# when it returns, CDROM_ROOT will be pointing to the second cd. 1347# when it returns, CDROM_ROOT will be pointing to the second cd.
1439# remember, you can only go forward in the cd chain, you can't go back. 1348# remember, you can only go forward in the cd chain, you can't go back.
1440cdrom_load_next_cd() { 1349cdrom_load_next_cd() {
1441 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1442 local var= 1350 local var
1443 1351 ((++CDROM_CURRENT_CD))
1444 if [[ ! -z ${CD_ROOT} ]] ; then
1445 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1446 return
1447 fi
1448 1352
1449 unset CDROM_ROOT 1353 unset CDROM_ROOT
1450 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1354 var=CD_ROOT_${CDROM_CURRENT_CD}
1355 [[ -z ${!var} ]] && var="CD_ROOT"
1451 if [[ -z ${!var} ]] ; then 1356 if [[ -z ${!var} ]] ; then
1452 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1357 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1453 cdrom_locate_file_on_cd ${!var} 1358 _cdrom_locate_file_on_cd ${!var}
1454 else 1359 else
1455 export CDROM_ROOT=${!var} 1360 export CDROM_ROOT=${!var}
1456 fi 1361 fi
1457 1362
1458 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1363 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1463# all it does is try to locate a give file on a cd ... if the cd isn't 1368# all it does is try to locate a give file on a cd ... if the cd isn't
1464# found, then a message asking for the user to insert the cdrom will be 1369# found, then a message asking for the user to insert the cdrom will be
1465# displayed and we'll hang out here until: 1370# displayed and we'll hang out here until:
1466# (1) the file is found on a mounted cdrom 1371# (1) the file is found on a mounted cdrom
1467# (2) the user hits CTRL+C 1372# (2) the user hits CTRL+C
1468cdrom_locate_file_on_cd() { 1373_cdrom_locate_file_on_cd() {
1374 local mline=""
1375 local showedmsg=0
1376
1469 while [[ -z ${CDROM_ROOT} ]] ; do 1377 while [[ -z ${CDROM_ROOT} ]] ; do
1378 local i=0
1379 local -a cdset=(${*//:/ })
1380 if [[ -n ${CDROM_SET} ]] ; then
1381 cdset=(${cdset[${CDROM_SET}]})
1382 fi
1383
1384 while [[ -n ${cdset[${i}]} ]] ; do
1470 local dir="$(dirname ${@})" 1385 local dir=$(dirname ${cdset[${i}]})
1471 local file="$(basename ${@})" 1386 local file=$(basename ${cdset[${i}]})
1472 local mline=""
1473 local showedmsg=0
1474 1387
1475 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1388 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1476 [[ -d ${mline}/${dir} ]] || continue 1389 [[ -d ${mline}/${dir} ]] || continue
1477 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1390 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1478 && export CDROM_ROOT=${mline} 1391 export CDROM_ROOT=${mline}
1392 export CDROM_SET=${i}
1393 export CDROM_MATCH=${cdset[${i}]}
1394 return
1395 fi
1396 done
1397
1398 ((++i))
1479 done 1399 done
1480 1400
1481 if [[ -z ${CDROM_ROOT} ]] ; then
1482 echo 1401 echo
1483 if [[ ${showedmsg} -eq 0 ]] ; then 1402 if [[ ${showedmsg} -eq 0 ]] ; then
1484 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1403 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1485 if [[ -z ${CDROM_NAME} ]] ; then 1404 if [[ -z ${CDROM_NAME} ]] ; then
1486 einfo "Please insert the cdrom for ${PN} now !" 1405 einfo "Please insert+mount the cdrom for ${PN} now !"
1487 else
1488 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1489 fi
1490 else 1406 else
1491 if [[ -z ${CDROM_NAME_1} ]] ; then
1492 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1493 else
1494 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1495 einfo "Please insert+mount the ${!var} cdrom now !" 1407 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1496 fi
1497 fi 1408 fi
1498 showedmsg=1 1409 else
1410 if [[ -z ${CDROM_NAME_1} ]] ; then
1411 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1412 else
1413 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1414 einfo "Please insert+mount the ${!var} cdrom now !"
1415 fi
1499 fi 1416 fi
1417 showedmsg=1
1418 fi
1500 einfo "Press return to scan for the cd again" 1419 einfo "Press return to scan for the cd again"
1501 einfo "or hit CTRL+C to abort the emerge." 1420 einfo "or hit CTRL+C to abort the emerge."
1502 read 1421 echo
1503 fi 1422 einfo "If you are having trouble with the detection"
1423 einfo "of your CD, it is possible that you do not have"
1424 einfo "Joliet support enabled in your kernel. Please"
1425 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1426 read || die "something is screwed with your system"
1504 done 1427 done
1505} 1428}
1506 1429
1507# Make sure that LINGUAS only contains languages that 1430# Make sure that LINGUAS only contains languages that
1508# a package can support 1431# a package can support
1518# directories and uses the union of the lists. 1441# directories and uses the union of the lists.
1519strip-linguas() { 1442strip-linguas() {
1520 local ls newls 1443 local ls newls
1521 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1444 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1522 local op=$1; shift 1445 local op=$1; shift
1523 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1446 ls=" $(find "$1" -name '*.po' -exec basename {} \;) "; shift
1524 local d f 1447 local d f
1525 for d in "$@" ; do 1448 for d in "$@" ; do
1526 if [[ ${op} == "-u" ]] ; then 1449 if [[ ${op} == "-u" ]] ; then
1527 newls=${ls} 1450 newls=${ls}
1528 else 1451 else
1529 newls="" 1452 newls=""
1530 fi 1453 fi
1531 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1454 for f in $(find "$d" -name '*.po' -exec basename {} \;) ; do
1532 if [[ ${op} == "-i" ]] ; then 1455 if [[ ${op} == "-i" ]] ; then
1533 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1456 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1534 else 1457 else
1535 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1458 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1536 fi 1459 fi
1570 while ((i--)) ; do 1493 while ((i--)) ; do
1571 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1494 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1572 done 1495 done
1573 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1496 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1574 case ${ARCH} in 1497 case ${ARCH} in
1575 x86) export ARCH="i386";; 1498 x86) export ARCH="i386";;
1576 amd64) export ARCH="x86_64";; 1499 amd64) export ARCH="x86_64";;
1577 hppa) export ARCH="parisc";; 1500 hppa) export ARCH="parisc";;
1578 mips) export ARCH="mips";; 1501 mips) export ARCH="mips";;
1579 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! 1502 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!
1580 *) export ARCH="${ARCH}";; 1503 *) export ARCH="${ARCH}";;
1581 esac 1504 esac
1582} 1505}
1583 1506
1584# set's ARCH back to what portage expects 1507# set's ARCH back to what portage expects
1585set_arch_to_portage() { 1508set_arch_to_portage() {
1592 1515
1593# Jeremy Huddleston <eradicator@gentoo.org>: 1516# Jeremy Huddleston <eradicator@gentoo.org>:
1594# preserve_old_lib /path/to/libblah.so.0 1517# preserve_old_lib /path/to/libblah.so.0
1595# preserve_old_lib_notify /path/to/libblah.so.0 1518# preserve_old_lib_notify /path/to/libblah.so.0
1596# 1519#
1597# These functions are useful when a lib in your package changes --soname. Such 1520# These functions are useful when a lib in your package changes --library. Such
1598# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1521# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1599# would break packages that link against it. Most people get around this 1522# would break packages that link against it. Most people get around this
1600# by using the portage SLOT mechanism, but that is not always a relevant 1523# by using the portage SLOT mechanism, but that is not always a relevant
1601# solution, so instead you can add the following to your ebuilds: 1524# solution, so instead you can add the following to your ebuilds:
1602# 1525#
1629 LIB=$1 1552 LIB=$1
1630 1553
1631 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1554 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1632 SONAME=`basename ${LIB}` 1555 SONAME=`basename ${LIB}`
1633 1556
1634 einfo "An old version of an installed library was detected on your system." 1557 ewarn "An old version of an installed library was detected on your system."
1635 einfo "In order to avoid breaking packages that link against is, this older version" 1558 ewarn "In order to avoid breaking packages that link against it, this older version"
1636 einfo "is not being removed. In order to make full use of this newer version," 1559 ewarn "is not being removed. In order to make full use of this newer version,"
1637 einfo "you will need to execute the following command:" 1560 ewarn "you will need to execute the following command:"
1638 einfo " revdep-rebuild --soname ${SONAME}" 1561 ewarn " revdep-rebuild --library ${SONAME}"
1639 einfo 1562 ewarn
1640 einfo "After doing that, you can safely remove ${LIB}" 1563 ewarn "After doing that, you can safely remove ${LIB}"
1641 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1564 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1642 fi 1565 fi
1643} 1566}
1644 1567
1645# Hack for people to figure out if a package was built with 1568# Hack for people to figure out if a package was built with
1646# certain USE flags 1569# certain USE flags
1656 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1579 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1657 1580
1658 local PKG=$(best_version $1) 1581 local PKG=$(best_version $1)
1659 shift 1582 shift
1660 1583
1661 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1584 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1585
1586 # if the USE file doesnt exist, assume the $PKG is either
1587 # injected or package.provided
1662 [[ ! -e ${USEFILE} ]] && return 1 1588 [[ ! -e ${USEFILE} ]] && return 0
1663 1589
1664 local USE_BUILT=$(<${USEFILE}) 1590 local USE_BUILT=$(<${USEFILE})
1665 while [[ $# -gt 0 ]] ; do 1591 while [[ $# -gt 0 ]] ; do
1666 if [[ ${opt} = "-o" ]] ; then 1592 if [[ ${opt} = "-o" ]] ; then
1667 has $1 ${USE_BUILT} && return 0 1593 has $1 ${USE_BUILT} && return 0
1692dopamd() { 1618dopamd() {
1693 [[ -z $1 ]] && die "dopamd requires at least one argument" 1619 [[ -z $1 ]] && die "dopamd requires at least one argument"
1694 1620
1695 use pam || return 0 1621 use pam || return 0
1696 1622
1697 insinto /etc/pam.d 1623 INSDESTTREE=/etc/pam.d \
1698 doins "$@" || die "failed to install $@" 1624 doins "$@" || die "failed to install $@"
1699} 1625}
1700# newpamd <old name> <new name> 1626# newpamd <old name> <new name>
1701# 1627#
1702# Install pam file <old name> as <new name> in /etc/pam.d 1628# Install pam file <old name> as <new name> in /etc/pam.d
1703newpamd() { 1629newpamd() {
1704 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1630 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1705 1631
1706 use pam || return 0 1632 use pam || return 0
1707 1633
1708 insinto /etc/pam.d 1634 INSDESTTREE=/etc/pam.d \
1709 newins "$1" "$2" || die "failed to install $1 as $2" 1635 newins "$1" "$2" || die "failed to install $1 as $2"
1710} 1636}
1711 1637
1712# make a wrapper script ... 1638# make a wrapper script ...
1713# NOTE: this was originally games_make_wrapper, but I noticed other places where 1639# NOTE: this was originally games_make_wrapper, but I noticed other places where
1719# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1645# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1720# $5 == path for wrapper 1646# $5 == path for wrapper
1721make_wrapper() { 1647make_wrapper() {
1722 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1648 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1723 local tmpwrapper=$(emktemp) 1649 local tmpwrapper=$(emktemp)
1650 # We don't want to quote ${bin} so that people can pass complex
1651 # things as $bin ... "./someprog --args"
1724 cat << EOF > "${tmpwrapper}" 1652 cat << EOF > "${tmpwrapper}"
1725#!/bin/sh 1653#!/bin/sh
1726cd "${chdir}" 1654cd "${chdir:-.}"
1655if [ -n "${libdir}" ] ; then
1656 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1727export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1657 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1658 else
1659 export LD_LIBRARY_PATH="${libdir}"
1660 fi
1661fi
1728exec ${bin} "\$@" 1662exec ${bin} "\$@"
1729EOF 1663EOF
1730 chmod go+rx "${tmpwrapper}" 1664 chmod go+rx "${tmpwrapper}"
1731 if [ -n "${5}" ] 1665 if [[ -n ${path} ]] ; then
1732 then
1733 exeinto ${5} 1666 exeinto "${path}"
1734 newexe "${tmpwrapper}" "${wrapper}" 1667 newexe "${tmpwrapper}" "${wrapper}"
1735 else 1668 else
1736 newbin "${tmpwrapper}" "${wrapper}" 1669 newbin "${tmpwrapper}" "${wrapper}"
1737 fi 1670 fi
1738} 1671}

Legend:
Removed from v.1.167  
changed lines
  Added in v.1.228

  ViewVC Help
Powered by ViewVC 1.1.20