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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20