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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.166  
changed lines
  Added in v.1.223

  ViewVC Help
Powered by ViewVC 1.1.20