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

Diff of /eclass/eutils.eclass

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

Revision 1.164 Revision 1.200
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.164 2005/03/30 14:12:25 wolf31o2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.200 2005/09/23 20:44:26 wolf31o2 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
20# ecpu_check
21# Usage:
22#
23# ecpu_check array_of_cpu_flags
24#
25# array_of_cpu_flags - An array of cpu flags to check against USE flags
26#
27# Checks user USE related cpu flags against /proc/cpuinfo. If user enables a
28# cpu flag that is not supported in their processor flags, it will warn the
29# user if CROSSCOMPILE is not set to 1 ( because cross compile users are
30# obviously using different cpu flags than their own cpu ). Examples:
31#
32# CPU_FLAGS=(mmx mmx2 sse sse2)
33# ecpu_check CPU_FLAGS
34# Chris White <chriswhite@gentoo.org> (03 Feb 2005)
35
36ecpu_check() {
37 # Think about changing below to: if [ "${CROSSCOMPILE}" -ne 1 -a -e "/proc/cpuinfo" ]
38 # and dropping the else if you do not plan on adding anything to that
39 # empty block ....
40 # PS: also try to add some quoting, and consider rather using ${foo} than $foo ...
41 if [ "${CROSSCOMPILE}" != "1" -a -e "/proc/cpuinfo" ]
42 then
43 CPU_FLAGS=${1}
44 USER_CPU=`grep "flags" /proc/cpuinfo`
45
46 for flags in `seq 1 ${#CPU_FLAGS[@]}`
47 do
48 if has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU} && ! has ${CPU_FLAGS[${flags} - 1]} ${USE}
49 then
50 ewarn "Your system is ${CPU_FLAGS[${flags} - 1]} capable but you don't have it enabled!"
51 ewarn "You might be cross compiling (in this case set CROSSCOMPILE to 1 to disable this warning."
52 fi
53
54 if ! has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU} && has ${CPU_FLAGS[${flags} -1]} ${USE}
55 then
56 ewarn "You have ${CPU_FLAGS[${flags} - 1]} support enabled but your processor doesn't"
57 ewarn "Seem to support it! You might be cross compiling or do not have /proc filesystem"
58 ewarn "enabled. If either is the case, set CROSSCOMPILE to 1 to disable this warning."
59 fi
60 done
61 fi
62}
63 18
64# 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
65# 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
66# outputting to a terminal, don't wait. For compatability purposes, the argument 21# outputting to a terminal, don't wait. For compatability purposes, the argument
67# must be an integer greater than zero. 22# must be an integer greater than zero.
112 dodir /usr/${libdir} 67 dodir /usr/${libdir}
113 68
114 for lib in "${@}" ; do 69 for lib in "${@}" ; do
115 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
116 /* GNU ld script 71 /* GNU ld script
117 Since Gentoo has critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
118 in /lib, and the static versions in /usr/lib, 73 in /lib, and the static versions in /usr/lib,
119 we need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
120 otherwise we run into linking problems. 75 otherwise we run into linking problems.
121 76
122 See bug http://bugs.gentoo.org/4411 for more info. 77 See bug http://bugs.gentoo.org/4411 for more info.
123 */ 78 */
124 GROUP ( /${libdir}/${lib} ) 79 GROUP ( /${libdir}/${lib} )
125 END_LDSCRIPT 80 END_LDSCRIPT
126 fperms a+x "/usr/${libdir}/${lib}" 81 fperms a+x "/usr/${libdir}/${lib}"
127 done 82 done
128} 83}
129 84
130# Simple function to draw a line consisting of '=' the same length as $* 85# Simple function to draw a line consisting of '=' the same length as $*
86# - only to be used by epatch()
131# 87#
132# <azarah@gentoo.org> (11 Nov 2002) 88# <azarah@gentoo.org> (11 Nov 2002)
133# 89#
134draw_line() { 90draw_line() {
135 local i=0 91 local i=0
161EPATCH_SOURCE="${WORKDIR}/patch" 117EPATCH_SOURCE="${WORKDIR}/patch"
162# Default extension for patches 118# Default extension for patches
163EPATCH_SUFFIX="patch.bz2" 119EPATCH_SUFFIX="patch.bz2"
164# Default options for patch 120# Default options for patch
165# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 121# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
166EPATCH_OPTS="-g0" 122# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch"
167# List of patches not to apply. Not this is only file names, 124# List of patches not to apply. Not this is only file names,
168# and not the full path .. 125# and not the full path ..
169EPATCH_EXCLUDE="" 126EPATCH_EXCLUDE=""
170# Change the printed message for a single patch. 127# Change the printed message for a single patch.
171EPATCH_SINGLE_MSG="" 128EPATCH_SINGLE_MSG=""
129# Change the printed message for multiple patches.
130EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
172# Force applying bulk patches even if not following the style: 131# Force applying bulk patches even if not following the style:
173# 132#
174# ??_${ARCH}_foo.${EPATCH_SUFFIX} 133# ??_${ARCH}_foo.${EPATCH_SUFFIX}
175# 134#
176EPATCH_FORCE="no" 135EPATCH_FORCE="no"
214 local PATCH_TARGET="${T}/$$.patch" 173 local PATCH_TARGET="${T}/$$.patch"
215 local PATCH_SUFFIX="" 174 local PATCH_SUFFIX=""
216 local SINGLE_PATCH="no" 175 local SINGLE_PATCH="no"
217 local x="" 176 local x=""
218 177
178 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
179
219 if [ "$#" -gt 1 ] 180 if [ "$#" -gt 1 ]
220 then 181 then
221 local m="" 182 local m=""
222 einfo "${#} patches to apply ..."
223 for m in "$@" ; do 183 for m in "$@" ; do
224 epatch "${m}" 184 epatch "${m}"
225 done 185 done
226 return 0 186 return 0
227 fi 187 fi
281 ;; 241 ;;
282 esac 242 esac
283 243
284 if [ "${SINGLE_PATCH}" = "no" ] 244 if [ "${SINGLE_PATCH}" = "no" ]
285 then 245 then
286 einfo "Applying various patches (bugfixes/updates) ..." 246 einfo "${EPATCH_MULTI_MSG}"
287 fi 247 fi
288 for x in ${EPATCH_SOURCE} 248 for x in ${EPATCH_SOURCE}
289 do 249 do
290 # New ARCH dependant patch naming scheme ... 250 # New ARCH dependant patch naming scheme ...
291 # 251 #
292 # ???_arch_foo.patch 252 # ???_arch_foo.patch
293 # 253 #
294 if [ -f ${x} ] && \ 254 if [ -f ${x} ] && \
295 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 255 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
296 [ "${EPATCH_FORCE}" = "yes" ]) 256 [ "${EPATCH_FORCE}" = "yes" ])
297 then 257 then
298 local count=0 258 local count=0
299 local popts="${EPATCH_OPTS}" 259 local popts="${EPATCH_OPTS}"
300 local patchname=${x##*/} 260 local patchname=${x##*/}
410 then 370 then
411 einfo "Done with patching" 371 einfo "Done with patching"
412 fi 372 fi
413} 373}
414 374
415# This function return true if we are using the NPTL pthreads
416# implementation.
417#
418# <azarah@gentoo.org> (06 March 2003)
419#
420have_NPTL() {
421 cat > ${T}/test-nptl.c <<-"END"
422 #define _XOPEN_SOURCE
423 #include <unistd.h>
424 #include <stdio.h>
425
426 int main()
427 {
428 char buf[255];
429 char *str = buf;
430
431 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
432 if (NULL != str) {
433 printf("%s\n", str);
434 if (NULL != strstr(str, "NPTL"))
435 return 0;
436 }
437
438 return 1;
439 }
440 END
441
442 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
443 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
444 then
445 echo "yes"
446 einfon "Checking what PTHREADS implementation we have ..."
447 if ${T}/nptl
448 then
449 return 0
450 else
451 return 1
452 fi
453 else
454 echo "no"
455 fi
456
457 return 1
458}
459
460# This function check how many cpu's are present, and then set
461# -j in MAKEOPTS accordingly.
462#
463# Thanks to nall <nall@gentoo.org> for this.
464#
465get_number_of_jobs() {
466 local jobs=0
467
468 if [ ! -r /proc/cpuinfo ]
469 then
470 return 1
471 fi
472
473 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
474 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
475 then
476 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
477 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
478 ADMINPARAM="${ADMINPARAM/-j}"
479 fi
480
481 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
482
483 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
484 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
485 then
486 # these archs will always have "[Pp]rocessor"
487 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
488
489 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
490 then
491 # sparc always has "ncpus active"
492 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
493
494 elif [ "${ARCH}" = "alpha" ]
495 then
496 # alpha has "cpus active", but only when compiled with SMP
497 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
498 then
499 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
500 else
501 jobs=2
502 fi
503
504 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
505 then
506 # ppc has "processor", but only when compiled with SMP
507 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
508 then
509 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
510 else
511 jobs=2
512 fi
513 elif [ "${ARCH}" = "s390" ]
514 then
515 # s390 has "# processors : "
516 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
517 else
518 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
519 die "Unknown ARCH -- ${ARCH}!"
520 fi
521
522 # Make sure the number is valid ...
523 if [ "${jobs}" -lt 1 ]
524 then
525 jobs=1
526 fi
527
528 if [ -n "${ADMINPARAM}" ]
529 then
530 if [ "${jobs}" -gt "${ADMINPARAM}" ]
531 then
532 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
533 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
534 else
535 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
536 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
537 fi
538 fi
539}
540
541# Cheap replacement for when debianutils (and thus mktemp) 375# Cheap replacement for when debianutils (and thus mktemp)
542# does not exist on the users system 376# does not exist on the users system
543# vapier@gentoo.org 377# vapier@gentoo.org
544# 378#
545# Takes just 1 optional parameter (the directory to create tmpfile in) 379# Takes just 1 optional parameter (the directory to create tmpfile in)
546emktemp() { 380emktemp() {
547 local exe="touch" 381 local exe="touch"
548 [ "$1" == "-d" ] && exe="mkdir" && shift 382 [[ $1 == -d ]] && exe="mkdir" && shift
549 local topdir="$1" 383 local topdir=$1
550 384
551 if [ -z "${topdir}" ] 385 if [[ -z ${topdir} ]] ; then
552 then
553 [ -z "${T}" ] \ 386 [[ -z ${T} ]] \
554 && topdir="/tmp" \ 387 && topdir="/tmp" \
555 || topdir="${T}" 388 || topdir=${T}
556 fi 389 fi
557 390
558 if [ -z "$(type -p mktemp)" ] 391 if [[ -z $(type -p mktemp) ]] ; then
559 then
560 local tmp=/ 392 local tmp=/
561 while [ -e "${tmp}" ] ; do 393 while [[ -e ${tmp} ]] ; do
562 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
563 done 395 done
564 ${exe} "${tmp}" 396 ${exe} "${tmp}" || ${exe} -p "${tmp}"
565 echo "${tmp}" 397 echo "${tmp}"
566 else 398 else
567 [ "${exe}" == "touch" ] \ 399 [[ ${exe} == "touch" ]] \
568 && exe="-p" \ 400 && exe="-p" \
569 || exe="-d" 401 || exe="-d"
570 mktemp ${exe} "${topdir}" 402 mktemp ${exe} "${topdir}"
571 fi 403 fi
572} 404}
576# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
577# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
578# 410#
579# egetent(database, key) 411# egetent(database, key)
580egetent() { 412egetent() {
581 if useq ppc-macos ; then 413 if [[ "${USERLAND}" == "Darwin" ]] ; then
582 case "$2" in 414 case "$2" in
583 *[!0-9]*) # Non numeric 415 *[!0-9]*) # Non numeric
584 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
585 ;; 417 ;;
586 *) # Numeric 418 *) # Numeric
587 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
588 ;; 420 ;;
589 esac 421 esac
590 elif useq x86-fbsd ; then 422 elif [[ "${USERLAND}" == "BSD" ]] ; then
591 local action 423 local action
592 if [ "$1" == "passwd" ] 424 if [ "$1" == "passwd" ]
593 then 425 then
594 action="user" 426 action="user"
595 else 427 else
615# homedir: /dev/null 447# homedir: /dev/null
616# groups: none 448# groups: none
617# extra: comment of 'added by portage for ${PN}' 449# extra: comment of 'added by portage for ${PN}'
618enewuser() { 450enewuser() {
619 # get the username 451 # get the username
620 local euser="$1"; shift 452 local euser=$1; shift
621 if [ -z "${euser}" ] 453 if [[ -z ${euser} ]] ; then
622 then
623 eerror "No username specified !" 454 eerror "No username specified !"
624 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
625 fi 456 fi
626 457
627 # lets see if the username already exists 458 # lets see if the username already exists
628 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 459 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
629 then
630 return 0 460 return 0
631 fi 461 fi
632 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
633 463
634 # options to pass to useradd 464 # options to pass to useradd
635 local opts= 465 local opts=
636 466
637 # handle uid 467 # handle uid
638 local euid="$1"; shift 468 local euid=$1; shift
639 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 469 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
640 then
641 if [ "${euid}" -gt 0 ] 470 if [[ ${euid} -gt 0 ]] ; then
642 then
643 if [ ! -z "`egetent passwd ${euid}`" ] 471 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
644 then
645 euid="next" 472 euid="next"
646 fi 473 fi
647 else 474 else
648 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
649 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
650 fi 477 fi
651 else 478 else
652 euid="next" 479 euid="next"
653 fi 480 fi
654 if [ "${euid}" == "next" ] 481 if [[ ${euid} == "next" ]] ; then
655 then 482 for euid in $(seq 101 999) ; do
656 local pwrange
657 if [ "${USERLAND}" == "BSD" ] ; then
658 pwrange="`jot 898 101`"
659 else
660 pwrange="`seq 101 999`"
661 fi
662 for euid in ${pwrange} ; do
663 [ -z "`egetent passwd ${euid}`" ] && break 483 [[ -z $(egetent passwd ${euid}) ]] && break
664 done 484 done
665 fi 485 fi
666 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
667 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
668 488
669 # handle shell 489 # handle shell
670 local eshell="$1"; shift 490 local eshell=$1; shift
671 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
672 then
673 if [ ! -e "${eshell}" ] 492 if [[ ! -e ${eshell} ]] ; then
674 then
675 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
676 die "${eshell} does not exist" 494 die "${eshell} does not exist"
677 fi 495 fi
678 else 496 else
679 if [ "${USERLAND}" == "BSD" ] 497 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null; do
680 then 498 [[ -x ${ROOT}${shell} ]] && break;
681 eshell="/usr/bin/false" 499 done
682 else 500
683 eshell="/bin/false" 501 if [[ ${shell} == "/dev/null" ]]; then
502 eerror "Unable to identify the shell to use"
503 die "Unable to identify the shell to use"
684 fi 504 fi
505
506 eshell=${shell}
685 fi 507 fi
686 einfo " - Shell: ${eshell}" 508 einfo " - Shell: ${eshell}"
687 opts="${opts} -s ${eshell}" 509 opts="${opts} -s ${eshell}"
688 510
689 # handle homedir 511 # handle homedir
690 local ehome="$1"; shift 512 local ehome=$1; shift
691 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 513 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
692 then
693 ehome="/dev/null" 514 ehome="/dev/null"
694 fi 515 fi
695 einfo " - Home: ${ehome}" 516 einfo " - Home: ${ehome}"
696 opts="${opts} -d ${ehome}" 517 opts="${opts} -d ${ehome}"
697 518
698 # handle groups 519 # handle groups
699 local egroups="$1"; shift 520 local egroups=$1; shift
700 if [ ! -z "${egroups}" ] 521 if [[ ! -z ${egroups} ]] ; then
701 then
702 local oldifs="${IFS}" 522 local oldifs=${IFS}
703 local defgroup="" exgroups="" 523 local defgroup="" exgroups=""
704 524
705 export IFS="," 525 export IFS=","
706 for g in ${egroups} 526 for g in ${egroups} ; do
707 do
708 export IFS="${oldifs}" 527 export IFS=${oldifs}
709 if [ -z "`egetent group \"${g}\"`" ] 528 if [[ -z $(egetent group "${g}") ]] ; then
710 then
711 eerror "You must add group ${g} to the system first" 529 eerror "You must add group ${g} to the system first"
712 die "${g} is not a valid GID" 530 die "${g} is not a valid GID"
713 fi 531 fi
714 if [ -z "${defgroup}" ] 532 if [[ -z ${defgroup} ]] ; then
715 then
716 defgroup="${g}" 533 defgroup=${g}
717 else 534 else
718 exgroups="${exgroups},${g}" 535 exgroups="${exgroups},${g}"
719 fi 536 fi
720 export IFS="," 537 export IFS=","
721 done 538 done
722 export IFS="${oldifs}" 539 export IFS=${oldifs}
723 540
724 opts="${opts} -g ${defgroup}" 541 opts="${opts} -g ${defgroup}"
725 if [ ! -z "${exgroups}" ] 542 if [[ ! -z ${exgroups} ]] ; then
726 then
727 opts="${opts} -G ${exgroups:1}" 543 opts="${opts} -G ${exgroups:1}"
728 fi 544 fi
729 else 545 else
730 egroups="(none)" 546 egroups="(none)"
731 fi 547 fi
732 einfo " - Groups: ${egroups}" 548 einfo " - Groups: ${egroups}"
733 549
734 # handle extra and add the user 550 # handle extra and add the user
735 local eextra="$@"
736 local oldsandbox="${SANDBOX_ON}" 551 local oldsandbox=${SANDBOX_ON}
737 export SANDBOX_ON="0" 552 export SANDBOX_ON="0"
738 if useq ppc-macos 553 case ${USERLAND} in
739 then 554 Darwin)
740 ### Make the user 555 ### Make the user
741 if [ -z "${eextra}" ] 556 if [[ -z $@ ]] ; then
742 then
743 dscl . create /users/${euser} uid ${euid} 557 dscl . create /users/${euser} uid ${euid}
744 dscl . create /users/${euser} shell ${eshell} 558 dscl . create /users/${euser} shell ${eshell}
745 dscl . create /users/${euser} home ${ehome} 559 dscl . create /users/${euser} home ${ehome}
746 dscl . create /users/${euser} realname "added by portage for ${PN}" 560 dscl . create /users/${euser} realname "added by portage for ${PN}"
747 ### Add the user to the groups specified 561 ### Add the user to the groups specified
748 local oldifs="${IFS}" 562 local oldifs=${IFS}
749 export IFS="," 563 export IFS=","
750 for g in ${egroups} 564 for g in ${egroups} ; do
751 do
752 dscl . merge /groups/${g} users ${euser} 565 dscl . merge /groups/${g} users ${euser}
753 done 566 done
754 export IFS="${oldifs}" 567 export IFS=${oldifs}
755 else 568 else
756 einfo "Extra options are not supported on macos yet" 569 einfo "Extra options are not supported on Darwin yet"
757 einfo "Please report the ebuild along with the info below" 570 einfo "Please report the ebuild along with the info below"
758 einfo "eextra: ${eextra}" 571 einfo "eextra: $@"
759 die "Required function missing" 572 die "Required function missing"
760 fi 573 fi
761 elif use x86-fbsd ; then 574 ;;
762 if [ -z "${eextra}" ] 575 BSD)
763 then 576 if [[ -z $@ ]] ; then
764 pw useradd ${euser} ${opts} \ 577 pw useradd ${euser} ${opts} \
765 -c "added by portage for ${PN}" \ 578 -c "added by portage for ${PN}" \
766 die "enewuser failed" 579 die "enewuser failed"
767 else 580 else
768 einfo " - Extra: ${eextra}" 581 einfo " - Extra: $@"
769 pw useradd ${euser} ${opts} \ 582 pw useradd ${euser} ${opts} \
770 -c ${eextra} || die "enewuser failed" 583 "$@" || die "enewuser failed"
771 fi 584 fi
772 else 585 ;;
773 if [ -z "${eextra}" ] 586 *)
774 then 587 if [[ -z $@ ]] ; then
775 useradd ${opts} ${euser} \ 588 useradd ${opts} ${euser} \
776 -c "added by portage for ${PN}" \ 589 -c "added by portage for ${PN}" \
777 || die "enewuser failed" 590 || die "enewuser failed"
778 else 591 else
779 einfo " - Extra: ${eextra}" 592 einfo " - Extra: $@"
780 useradd ${opts} ${euser} ${eextra} \ 593 useradd ${opts} ${euser} "$@" \
781 || die "enewuser failed" 594 || die "enewuser failed"
782 fi 595 fi
596 ;;
597 esac
598
599 if [[ ! -e ${ROOT}/${ehome} ]] ; then
600 einfo " - Creating ${ehome} in ${ROOT}"
601 mkdir -p "${ROOT}/${ehome}"
602 chown ${euser} "${ROOT}/${ehome}"
603 chmod 755 "${ROOT}/${ehome}"
783 fi 604 fi
605
784 export SANDBOX_ON="${oldsandbox}" 606 export SANDBOX_ON=${oldsandbox}
785
786 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
787 then
788 einfo " - Creating ${ehome} in ${D}"
789 dodir ${ehome}
790 fowners ${euser} ${ehome}
791 fperms 755 ${ehome}
792 fi
793} 607}
794 608
795# Simplify/standardize adding groups to the system 609# Simplify/standardize adding groups to the system
796# vapier@gentoo.org 610# vapier@gentoo.org
797# 611#
826 then 640 then
827 if [ "${egid}" -gt 0 ] 641 if [ "${egid}" -gt 0 ]
828 then 642 then
829 if [ -z "`egetent group ${egid}`" ] 643 if [ -z "`egetent group ${egid}`" ]
830 then 644 then
831 if useq ppc-macos ; then 645 if [[ "${USERLAND}" == "Darwin" ]]; then
832 opts="${opts} ${egid}" 646 opts="${opts} ${egid}"
833 else 647 else
834 opts="${opts} -g ${egid}" 648 opts="${opts} -g ${egid}"
835 fi 649 fi
836 else 650 else
850 opts="${opts} ${eextra}" 664 opts="${opts} ${eextra}"
851 665
852 # add the group 666 # add the group
853 local oldsandbox="${SANDBOX_ON}" 667 local oldsandbox="${SANDBOX_ON}"
854 export SANDBOX_ON="0" 668 export SANDBOX_ON="0"
855 if useq ppc-macos ; then 669 if [[ "${USERLAND}" == "Darwin" ]]; then
856 if [ ! -z "${eextra}" ]; 670 if [ ! -z "${eextra}" ];
857 then 671 then
858 einfo "Extra options are not supported on macos yet" 672 einfo "Extra options are not supported on Darwin/OS X yet"
859 einfo "Please report the ebuild along with the info below" 673 einfo "Please report the ebuild along with the info below"
860 einfo "eextra: ${eextra}" 674 einfo "eextra: ${eextra}"
861 die "Required function missing" 675 die "Required function missing"
862 fi 676 fi
863 677
864 # If we need the next available 678 # If we need the next available
865 case ${egid} in 679 case ${egid} in
866 *[!0-9]*) # Non numeric 680 *[!0-9]*) # Non numeric
867 for egid in `jot 898 101`; do 681 for egid in $(seq 101 999); do
868 [ -z "`egetent group ${egid}`" ] && break 682 [ -z "`egetent group ${egid}`" ] && break
869 done 683 done
870 esac 684 esac
871 dscl . create /groups/${egroup} gid ${egid} 685 dscl . create /groups/${egroup} gid ${egid}
872 dscl . create /groups/${egroup} passwd '*' 686 dscl . create /groups/${egroup} passwd '*'
873 elif use x86-fbsd ; then 687 elif [[ "${USERLAND}" == "BSD" ]] ; then
874 case ${egid} in 688 case ${egid} in
875 *[!0-9]*) # Non numeric 689 *[!0-9]*) # Non numeric
876 for egid in `jot 898 101`; do 690 for egid in $(seq 101 999); do
877 [ -z "`egetent group ${egid}`" ] && break 691 [ -z "`egetent group ${egid}`" ] && break
878 done 692 done
879 esac 693 esac
880 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 694 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
881 else 695 else
913# name: the name that will show up in the menu 727# name: the name that will show up in the menu
914# icon: give your little like a pretty little icon ... 728# icon: give your little like a pretty little icon ...
915# this can be relative (to /usr/share/pixmaps) or 729# this can be relative (to /usr/share/pixmaps) or
916# a full path to an icon 730# a full path to an icon
917# type: what kind of application is this ? for categories: 731# type: what kind of application is this ? for categories:
918# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 732# http://www.freedesktop.org/Standards/desktop-entry-spec
919# path: if your app needs to startup in a specific dir 733# path: if your app needs to startup in a specific dir
920make_desktop_entry() { 734make_desktop_entry() {
921 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 735 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
922 736
923 local exec=${1} 737 local exec=${1}
949 dev) 763 dev)
950 type="Development" 764 type="Development"
951 ;; 765 ;;
952 766
953 games) 767 games)
954 [[ -z ${path} ]] && path=${GAMES_BINDIR}
955
956 case ${catmin} in 768 case ${catmin} in
957 action) type=ActionGame;; 769 action) type=ActionGame;;
958 arcade) type=ArcadeGame;; 770 arcade) type=ArcadeGame;;
959 board) type=BoardGame;; 771 board) type=BoardGame;;
960 kid) type=KidsGame;; 772 kid) type=KidsGame;;
1025 *) 837 *)
1026 type= 838 type=
1027 ;; 839 ;;
1028 esac 840 esac
1029 fi 841 fi
1030 842 if [ "${SLOT}" == "0" ] ; then
843 local desktop_name="${PN}"
844 else
845 local desktop_name="${PN}-${SLOT}"
846 fi
1031 local desktop=${T}/${exec%% *}-${P}.desktop 847 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
1032 848
1033echo "[Desktop Entry] 849echo "[Desktop Entry]
1034Encoding=UTF-8 850Encoding=UTF-8
1035Version=0.9.2 851Version=0.9.2
1036Name=${name} 852Name=${name}
1052# make_desktop_entry(<title>, <command>) 868# make_desktop_entry(<title>, <command>)
1053# title: File to execute to start the Window Manager 869# title: File to execute to start the Window Manager
1054# command: Name of the Window Manager 870# command: Name of the Window Manager
1055 871
1056make_session_desktop() { 872make_session_desktop() {
1057
1058 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 873 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
1059 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1 874 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
1060 875
1061 local title="${1}" 876 local title=$1
1062 local command="${2}" 877 local command=$2
1063 local desktop="${T}/${wm}.desktop" 878 local desktop=${T}/${wm}.desktop
1064 879
1065echo "[Desktop Entry] 880echo "[Desktop Entry]
1066Encoding=UTF-8 881Encoding=UTF-8
1067Name=${title} 882Name=${title}
1068Comment=This session logs you into ${title} 883Comment=This session logs you into ${title}
1070TryExec=${command} 885TryExec=${command}
1071Type=Application" > "${desktop}" 886Type=Application" > "${desktop}"
1072 887
1073 insinto /usr/share/xsessions 888 insinto /usr/share/xsessions
1074 doins "${desktop}" 889 doins "${desktop}"
1075
1076 return 0
1077} 890}
1078 891
1079domenu() { 892domenu() {
1080 local i 893 local i j
1081 local j
1082 insinto /usr/share/applications 894 insinto /usr/share/applications
1083 for i in ${@} 895 for i in "$@" ; do
1084 do
1085 if [ -f "${i}" ]; 896 if [[ -f ${i} ]] ; then
1086 then
1087 doins ${i} 897 doins "${i}"
1088 elif [ -d "${i}" ]; 898 elif [[ -d ${i} ]] ; then
1089 then
1090 for j in ${i}/*.desktop 899 for j in "${i}"/*.desktop ; do
1091 do
1092 doins ${j} 900 doins "${j}"
1093 done 901 done
1094 fi 902 fi
1095 done 903 done
1096} 904}
905newmenu() {
906 insinto /usr/share/applications
907 newins "$1" "$2"
908}
1097 909
1098doicon() { 910doicon() {
1099 local i 911 local i j
1100 local j
1101 insinto /usr/share/pixmaps 912 insinto /usr/share/pixmaps
1102 for i in ${@} 913 for i in "$@" ; do
1103 do
1104 if [ -f "${i}" ]; 914 if [[ -f ${i} ]] ; then
1105 then
1106 doins ${i} 915 doins "${i}"
1107 elif [ -d "${i}" ]; 916 elif [[ -d ${i} ]] ; then
1108 then
1109 for j in ${i}/*.png 917 for j in "${i}"/*.png ; do
1110 do
1111 doins ${j} 918 doins "${j}"
1112 done 919 done
1113 fi 920 fi
1114 done 921 done
922}
923newicon() {
924 insinto /usr/share/pixmaps
925 newins "$1" "$2"
1115} 926}
1116 927
1117############################################################## 928##############################################################
1118# END: Handle .desktop files and menu entries # 929# END: Handle .desktop files and menu entries #
1119############################################################## 930##############################################################
1120 931
1121 932
1122# for internal use only (unpack_pdv and unpack_makeself) 933# for internal use only (unpack_pdv and unpack_makeself)
1123find_unpackable_file() { 934find_unpackable_file() {
1124 local src="$1" 935 local src=$1
1125 if [ -z "${src}" ] 936 if [[ -z ${src} ]] ; then
1126 then
1127 src="${DISTDIR}/${A}" 937 src=${DISTDIR}/${A}
1128 else 938 else
1129 if [ -e "${DISTDIR}/${src}" ] 939 if [[ -e ${DISTDIR}/${src} ]] ; then
1130 then
1131 src="${DISTDIR}/${src}" 940 src=${DISTDIR}/${src}
1132 elif [ -e "${PWD}/${src}" ] 941 elif [[ -e ${PWD}/${src} ]] ; then
1133 then
1134 src="${PWD}/${src}" 942 src=${PWD}/${src}
1135 elif [ -e "${src}" ] 943 elif [[ -e ${src} ]] ; then
1136 then
1137 src="${src}" 944 src=${src}
1138 fi
1139 fi 945 fi
1140 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 946 fi
947 [[ ! -e ${src} ]] && return 1
1141 echo "${src}" 948 echo "${src}"
1142} 949}
1143 950
1144# Unpack those pesky pdv generated files ... 951# Unpack those pesky pdv generated files ...
1145# They're self-unpacking programs with the binary package stuffed in 952# They're self-unpacking programs with the binary package stuffed in
1160# lseek 967# lseek
1161# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 968# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1162# lseek(3, -4, SEEK_END) = 2981250 969# lseek(3, -4, SEEK_END) = 2981250
1163# thus we would pass in the value of '4' as the second parameter. 970# thus we would pass in the value of '4' as the second parameter.
1164unpack_pdv() { 971unpack_pdv() {
1165 local src="`find_unpackable_file $1`" 972 local src=$(find_unpackable_file $1)
1166 local sizeoff_t="$2" 973 local sizeoff_t=$2
1167 974
975 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1168 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 976 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1169 977
1170 local shrtsrc="`basename ${src}`" 978 local shrtsrc="`basename ${src}`"
1171 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 979 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1172 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 980 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1173 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 981 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1239# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1047# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1240# - If the file is not specified then unpack will utilize ${A}. 1048# - If the file is not specified then unpack will utilize ${A}.
1241# - If the offset is not specified then we will attempt to extract 1049# - If the offset is not specified then we will attempt to extract
1242# the proper offset from the script itself. 1050# the proper offset from the script itself.
1243unpack_makeself() { 1051unpack_makeself() {
1244 local src="$(find_unpackable_file "$1")" 1052 local src=$(find_unpackable_file "$1")
1245 local skip="$2" 1053 local skip=$2
1246 local exe="$3" 1054 local exe=$3
1247 1055
1056 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1057
1248 local shrtsrc="$(basename "${src}")" 1058 local shrtsrc=$(basename "${src}")
1249 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1059 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1250 if [ -z "${skip}" ] 1060 if [ -z "${skip}" ]
1251 then 1061 then
1252 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1062 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1253 local skip=0 1063 local skip=0
1324check_license() { 1134check_license() {
1325 local lic=$1 1135 local lic=$1
1326 if [ -z "${lic}" ] ; then 1136 if [ -z "${lic}" ] ; then
1327 lic="${PORTDIR}/licenses/${LICENSE}" 1137 lic="${PORTDIR}/licenses/${LICENSE}"
1328 else 1138 else
1329 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1139 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1330 lic="${PORTDIR}/licenses/${src}" 1140 lic="${PORTDIR}/licenses/${lic}"
1331 elif [ -e "${PWD}/${src}" ] ; then 1141 elif [ -e "${PWD}/${lic}" ] ; then
1332 lic="${PWD}/${src}" 1142 lic="${PWD}/${lic}"
1333 elif [ -e "${src}" ] ; then 1143 elif [ -e "${lic}" ] ; then
1334 lic="${src}" 1144 lic="${lic}"
1335 fi
1336 fi 1145 fi
1146 fi
1337 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1147 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1338 local l="`basename ${lic}`" 1148 local l="`basename ${lic}`"
1339 1149
1340 # here is where we check for the licenses the user already 1150 # here is where we check for the licenses the user already
1341 # accepted ... if we don't find a match, we make the user accept 1151 # accepted ... if we don't find a match, we make the user accept
1342 local shopts=$- 1152 local shopts=$-
1513# displayed and we'll hang out here until: 1323# displayed and we'll hang out here until:
1514# (1) the file is found on a mounted cdrom 1324# (1) the file is found on a mounted cdrom
1515# (2) the user hits CTRL+C 1325# (2) the user hits CTRL+C
1516cdrom_locate_file_on_cd() { 1326cdrom_locate_file_on_cd() {
1517 while [[ -z ${CDROM_ROOT} ]] ; do 1327 while [[ -z ${CDROM_ROOT} ]] ; do
1518 local dir="$(dirname ${@})" 1328 local dir=$(dirname "$*")
1519 local file="$(basename ${@})" 1329 local file=$(basename "$*")
1520 local mline="" 1330 local mline=""
1521 local showedmsg=0 1331 local showedmsg=0
1522 1332
1523 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1333 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1524 [[ -d ${mline}/${dir} ]] || continue 1334 [[ -d ${mline}/${dir} ]] || continue
1525 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1335 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1526 && export CDROM_ROOT=${mline} 1336 && export CDROM_ROOT=${mline}
1527 done 1337 done
1528 1338
1529 if [[ -z ${CDROM_ROOT} ]] ; then 1339 if [[ -z ${CDROM_ROOT} ]] ; then
1530 echo 1340 echo
1545 fi 1355 fi
1546 showedmsg=1 1356 showedmsg=1
1547 fi 1357 fi
1548 einfo "Press return to scan for the cd again" 1358 einfo "Press return to scan for the cd again"
1549 einfo "or hit CTRL+C to abort the emerge." 1359 einfo "or hit CTRL+C to abort the emerge."
1360 echo
1361 einfo "If you are having trouble with the detection"
1362 einfo "of your CD, it is possible that you do not have"
1363 einfo "Joliet support enabled in your kernel. Please"
1364 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1550 read 1365 read
1551 fi 1366 fi
1552 done 1367 done
1553} 1368}
1554 1369
1598 else 1413 else
1599 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1414 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1600 fi 1415 fi
1601 done 1416 done
1602 if [[ -z ${newls} ]] ; then 1417 if [[ -z ${newls} ]] ; then
1603 unset LINGUAS 1418 export LINGUAS=""
1604 else 1419 else
1605 export LINGUAS=${newls:1} 1420 export LINGUAS=${newls:1}
1606 fi 1421 fi
1607} 1422}
1608 1423
1618 while ((i--)) ; do 1433 while ((i--)) ; do
1619 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1434 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1620 done 1435 done
1621 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1436 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1622 case ${ARCH} in 1437 case ${ARCH} in
1623 x86) export ARCH="i386";; 1438 x86) export ARCH="i386";;
1624 amd64) export ARCH="x86_64";; 1439 amd64) export ARCH="x86_64";;
1625 hppa) export ARCH="parisc";; 1440 hppa) export ARCH="parisc";;
1626 mips) export ARCH="mips";; 1441 mips) export ARCH="mips";;
1627 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! 1442 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!
1628 *) export ARCH="${ARCH}";; 1443 *) export ARCH="${ARCH}";;
1629 esac 1444 esac
1630} 1445}
1631 1446
1632# set's ARCH back to what portage expects 1447# set's ARCH back to what portage expects
1633set_arch_to_portage() { 1448set_arch_to_portage() {
1677 LIB=$1 1492 LIB=$1
1678 1493
1679 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1494 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1680 SONAME=`basename ${LIB}` 1495 SONAME=`basename ${LIB}`
1681 1496
1682 einfo "An old version of an installed library was detected on your system." 1497 ewarn "An old version of an installed library was detected on your system."
1683 einfo "In order to avoid breaking packages that link against is, this older version" 1498 ewarn "In order to avoid breaking packages that link against it, this older version"
1684 einfo "is not being removed. In order to make full use of this newer version," 1499 ewarn "is not being removed. In order to make full use of this newer version,"
1685 einfo "you will need to execute the following command:" 1500 ewarn "you will need to execute the following command:"
1686 einfo " revdep-rebuild --soname ${SONAME}" 1501 ewarn " revdep-rebuild --soname ${SONAME}"
1687 einfo 1502 ewarn
1688 einfo "After doing that, you can safely remove ${LIB}" 1503 ewarn "After doing that, you can safely remove ${LIB}"
1689 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1504 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1690 fi 1505 fi
1691} 1506}
1692 1507
1693# Hack for people to figure out if a package was built with 1508# Hack for people to figure out if a package was built with
1694# certain USE flags 1509# certain USE flags
1740dopamd() { 1555dopamd() {
1741 [[ -z $1 ]] && die "dopamd requires at least one argument" 1556 [[ -z $1 ]] && die "dopamd requires at least one argument"
1742 1557
1743 use pam || return 0 1558 use pam || return 0
1744 1559
1745 insinto /etc/pam.d 1560 INSDESTTREE=/etc/pam.d \
1746 doins "$@" || die "failed to install $@" 1561 doins "$@" || die "failed to install $@"
1747} 1562}
1748# newpamd <old name> <new name> 1563# newpamd <old name> <new name>
1749# 1564#
1750# Install pam file <old name> as <new name> in /etc/pam.d 1565# Install pam file <old name> as <new name> in /etc/pam.d
1751newpamd() { 1566newpamd() {
1752 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1567 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1753 1568
1754 use pam || return 0 1569 use pam || return 0
1755 1570
1756 insinto /etc/pam.d 1571 INSDESTTREE=/etc/pam.d \
1757 newins "$1" "$2" || die "failed to install $1 as $2" 1572 newins "$1" "$2" || die "failed to install $1 as $2"
1758} 1573}
1759 1574
1760# make a wrapper script ... 1575# make a wrapper script ...
1761# NOTE: this was originally games_make_wrapper, but I noticed other places where 1576# NOTE: this was originally games_make_wrapper, but I noticed other places where

Legend:
Removed from v.1.164  
changed lines
  Added in v.1.200

  ViewVC Help
Powered by ViewVC 1.1.20