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

Diff of /eclass/eutils.eclass

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

Revision 1.41 Revision 1.61
1# Copyright 1999-2003 Gentoo Technologies, Inc. 1# Copyright 1999-2003 Gentoo Technologies, Inc.
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.41 2003/07/14 04:47:17 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.61 2003/09/26 17:01:45 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.
… …
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12ECLASS=eutils 12ECLASS=eutils
13INHERITED="$INHERITED $ECLASS" 13INHERITED="$INHERITED $ECLASS"
14 14
15DEPEND="$DEPEND !bootstrap? ( sys-devel/patch )" 15newdepend "!bootstrap? ( sys-devel/patch )"
16 16
17DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
18 18
19# This function generate linker scripts in /usr/lib for dynamic 19# This function generate linker scripts in /usr/lib for dynamic
20# libs in /lib. This is to fix linking problems when you have 20# libs in /lib. This is to fix linking problems when you have
… …
88# Default directory where patches are located 88# Default directory where patches are located
89EPATCH_SOURCE="${WORKDIR}/patch" 89EPATCH_SOURCE="${WORKDIR}/patch"
90# Default extension for patches 90# Default extension for patches
91EPATCH_SUFFIX="patch.bz2" 91EPATCH_SUFFIX="patch.bz2"
92# Default options for patch 92# Default options for patch
93# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
93EPATCH_OPTS="" 94EPATCH_OPTS="-g0"
94# List of patches not to apply. Not this is only file names, 95# List of patches not to apply. Not this is only file names,
95# and not the full path .. 96# and not the full path ..
96EPATCH_EXCLUDE="" 97EPATCH_EXCLUDE=""
97# Change the printed message for a single patch. 98# Change the printed message for a single patch.
98EPATCH_SINGLE_MSG="" 99EPATCH_SINGLE_MSG=""
… …
401 fi 402 fi
402 403
403 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`" 404 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
404 405
405 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \ 406 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
406 "${ARCH}" = "arm" -o "${ARCH}" = "mips" ] 407 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
407 then 408 then
408 # these archs will always have "[Pp]rocessor" 409 # these archs will always have "[Pp]rocessor"
409 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))" 410 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
410 411
411 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ] 412 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
… …
451 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}" 452 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
452 else 453 else
453 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..." 454 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..."
454 export MAKEOPTS="${MAKEOPTS} -j${jobs}" 455 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
455 fi 456 fi
457 fi
458}
459
460# Cheap replacement for when debianutils (and thus mktemp)
461# do not exist on the users system
462# vapier@gentoo.org
463#
464# Takes just 1 parameter (the directory to create tmpfile in)
465mymktemp() {
466 local topdir="$1"
467
468 [ -z "${topdir}" ] && topdir=/tmp
469 if [ "`which mktemp 2>/dev/null`" ]
470 then
471 mktemp -p ${topdir}
472 else
473 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
474 touch ${tmp}
475 echo ${tmp}
456 fi 476 fi
457} 477}
458 478
459# Simplify/standardize adding users to the system 479# Simplify/standardize adding users to the system
460# vapier@gentoo.org 480# vapier@gentoo.org
… …
470# groups: none 490# groups: none
471# extra: comment of 'added by portage for ${PN}' 491# extra: comment of 'added by portage for ${PN}'
472enewuser() { 492enewuser() {
473 # get the username 493 # get the username
474 local euser="$1"; shift 494 local euser="$1"; shift
475 if [ -z "${euser}" ] ; then 495 if [ -z "${euser}" ]
496 then
476 eerror "No username specified !" 497 eerror "No username specified !"
477 die "Cannot call enewuser without a username" 498 die "Cannot call enewuser without a username"
478 fi 499 fi
479 einfo "Adding user '${euser}' to your system ..."
480 500
481 # setup a file for testing usernames/groups 501 # setup a file for testing usernames/groups
482 local tmpfile="`mktemp -p ${T}`" 502 local tmpfile="`mymktemp ${T}`"
483 touch ${tmpfile}
484 chown ${euser} ${tmpfile} >& /dev/null 503 chown ${euser} ${tmpfile} >& /dev/null
485 local realuser="`ls -l ${tmpfile} | awk '{print $3}'`" 504 local realuser="`ls -l ${tmpfile} | awk '{print $3}'`"
486 505
487 # see if user already exists 506 # see if user already exists
488 if [ "${euser}" == "${realuser}" ] ; then 507 if [ "${euser}" == "${realuser}" ]
489 einfo "${euser} already exists on your system :)" 508 then
490 return 0 509 return 0
491 fi 510 fi
511 einfo "Adding user '${euser}' to your system ..."
492 512
493 # options to pass to useradd 513 # options to pass to useradd
494 local opts="" 514 local opts=
495 515
496 # handle uid 516 # handle uid
497 local euid="$1"; shift 517 local euid="$1"; shift
498 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] ; then 518 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ]
519 then
499 if [ ${euid} -gt 0 ] ; then 520 if [ "${euid}" -gt 0 ]
521 then
500 opts="${opts} -u ${euid}" 522 opts="${opts} -u ${euid}"
501 else 523 else
502 eerror "Userid given but is not greater than 0 !" 524 eerror "Userid given but is not greater than 0 !"
503 die "${euid} is not a valid UID" 525 die "${euid} is not a valid UID"
504 fi 526 fi
… …
507 fi 529 fi
508 einfo " - Userid: ${euid}" 530 einfo " - Userid: ${euid}"
509 531
510 # handle shell 532 # handle shell
511 local eshell="$1"; shift 533 local eshell="$1"; shift
512 if [ ! -z "${eshell}" ] ; then 534 if [ ! -z "${eshell}" ]
535 then
513 if [ ! -e ${eshell} ] ; then 536 if [ ! -e "${eshell}" ]
537 then
514 eerror "A shell was specified but it does not exist !" 538 eerror "A shell was specified but it does not exist !"
515 die "${eshell} does not exist" 539 die "${eshell} does not exist"
516 fi 540 fi
517 else 541 else
518 eshell=/bin/false 542 eshell="/bin/false"
519 fi 543 fi
520 einfo " - Shell: ${eshell}" 544 einfo " - Shell: ${eshell}"
521 opts="${opts} -s ${eshell}" 545 opts="${opts} -s ${eshell}"
522 546
523 # handle homedir 547 # handle homedir
524 local ehome="$1"; shift 548 local ehome="$1"; shift
525 if [ -z "${ehome}" ] ; then 549 if [ -z "${ehome}" ]
550 then
526 ehome=/dev/null 551 ehome="/dev/null"
527 fi 552 fi
528 einfo " - Home: ${ehome}" 553 einfo " - Home: ${ehome}"
529 opts="${opts} -d ${ehome}" 554 opts="${opts} -d ${ehome}"
530 555
531 # handle groups 556 # handle groups
532 local egroups="$1"; shift 557 local egroups="$1"; shift
533 if [ ! -z "${egroups}" ] ; then 558 if [ ! -z "${egroups}" ]
559 then
534 local realgroup 560 local realgroup=
535 local oldifs="${IFS}" 561 local oldifs="${IFS}"
536 export IFS="," 562 export IFS=","
537 for g in ${egroups} ; do 563 for g in ${egroups}
564 do
538 chgrp ${g} ${tmpfile} >& /dev/null 565 chgrp ${g} ${tmpfile} >& /dev/null
539 realgroup="`ls -l ${tmpfile} | awk '{print $4}'`" 566 realgroup="`ls -l ${tmpfile} | awk '{print $4}'`"
540 if [ "${g}" != "${realgroup}" ] ; then 567 if [ "${g}" != "${realgroup}" ]
568 then
541 eerror "You must add ${g} to the system first" 569 eerror "You must add ${g} to the system first"
542 die "${g} is not a valid GID" 570 die "${g} is not a valid GID"
543 fi 571 fi
544 done 572 done
545 export IFS="${oldifs}" 573 export IFS="${oldifs}"
… …
549 fi 577 fi
550 einfo " - Groups: ${egroups}" 578 einfo " - Groups: ${egroups}"
551 579
552 # handle extra and add the user 580 # handle extra and add the user
553 local eextra="$@" 581 local eextra="$@"
554 local oldsandbox=${SANDBOX_ON} 582 local oldsandbox="${SANDBOX_ON}"
555 export SANDBOX_ON="0" 583 export SANDBOX_ON="0"
556 if [ -z "${eextra}" ] ; then 584 if [ -z "${eextra}" ]
585 then
557 useradd ${opts} ${euser} \ 586 useradd ${opts} ${euser} \
558 -c "added by portage for ${PN}" \ 587 -c "added by portage for ${PN}" \
559 || die "enewuser failed" 588 || die "enewuser failed"
560 else 589 else
561 einfo " - Extra: ${eextra}" 590 einfo " - Extra: ${eextra}"
562 useradd ${opts} ${euser} ${eextra} \ 591 useradd ${opts} ${euser} ${eextra} \
563 || die "enewuser failed" 592 || die "enewuser failed"
564 fi 593 fi
565 export SANDBOX_ON="${oldsandbox}" 594 export SANDBOX_ON="${oldsandbox}"
566 595
567 if [ ! -e ${ehome} ] && [ ! -e ${D}/${ehome} ] ; then 596 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
597 then
568 einfo " - Creating ${ehome} in ${D}" 598 einfo " - Creating ${ehome} in ${D}"
569 dodir ${ehome} 599 dodir ${ehome}
570 fowners ${euser} ${ehome} 600 fowners ${euser} ${ehome}
571 fperms 755 ${ehome} 601 fperms 755 ${ehome}
572 fi 602 fi
… …
582# gid: next available (see groupadd(8)) 612# gid: next available (see groupadd(8))
583# extra: none 613# extra: none
584enewgroup() { 614enewgroup() {
585 # get the group 615 # get the group
586 local egroup="$1"; shift 616 local egroup="$1"; shift
587 if [ -z "${egroup}" ] ; then 617 if [ -z "${egroup}" ]
618 then
588 eerror "No group specified !" 619 eerror "No group specified !"
589 die "Cannot call enewgroup without a group" 620 die "Cannot call enewgroup without a group"
590 fi 621 fi
591 einfo "Adding group '${egroup}' to your system ..."
592 622
593 # setup a file for testing groupname 623 # setup a file for testing groupname
594 local tmpfile="`mktemp -p ${T}`" 624 local tmpfile="`mymktemp ${T}`"
595 touch ${tmpfile}
596 chgrp ${egroup} ${tmpfile} >& /dev/null 625 chgrp ${egroup} ${tmpfile} >& /dev/null
597 local realgroup="`ls -l ${tmpfile} | awk '{print $4}'`" 626 local realgroup="`ls -l ${tmpfile} | awk '{print $4}'`"
598 627
599 # see if group already exists 628 # see if group already exists
600 if [ "${egroup}" == "${realgroup}" ] ; then 629 if [ "${egroup}" == "${realgroup}" ]
601 einfo "${egroup} already exists on your system :)" 630 then
602 return 0 631 return 0
603 fi 632 fi
633 einfo "Adding group '${egroup}' to your system ..."
604 634
605 # options to pass to useradd 635 # options to pass to useradd
606 local opts="" 636 local opts=
607 637
608 # handle gid 638 # handle gid
609 local egid="$1"; shift 639 local egid="$1"; shift
610 if [ ! -z "${egid}" ] ; then 640 if [ ! -z "${egid}" ]
641 then
611 if [ ${egid} -gt 0 ] ; then 642 if [ "${egid}" -gt 0 ]
643 then
612 opts="${opts} -g ${egid}" 644 opts="${opts} -g ${egid}"
613 else 645 else
614 eerror "Groupid given but is not greater than 0 !" 646 eerror "Groupid given but is not greater than 0 !"
615 die "${egid} is not a valid GID" 647 die "${egid} is not a valid GID"
616 fi 648 fi
… …
622 # handle extra 654 # handle extra
623 local eextra="$@" 655 local eextra="$@"
624 opts="${opts} ${eextra}" 656 opts="${opts} ${eextra}"
625 657
626 # add the group 658 # add the group
627 local oldsandbox=${SANDBOX_ON} 659 local oldsandbox="${SANDBOX_ON}"
628 export SANDBOX_ON="0" 660 export SANDBOX_ON="0"
629 groupadd ${opts} ${egroup} || die "enewgroup failed" 661 groupadd ${opts} ${egroup} || die "enewgroup failed"
630 export SANDBOX_ON="${oldsandbox}" 662 export SANDBOX_ON="${oldsandbox}"
631} 663}
632 664
633# Simple script to replace 'dos2unix' binaries 665# Simple script to replace 'dos2unix' binaries
634# vapier@gentoo.org 666# vapier@gentoo.org
635# 667#
636# edos2unix(file, <more files>...) 668# edos2unix(file, <more files>...)
637edos2unix() { 669edos2unix() {
638 for f in $@ ; do 670 for f in "$@"
671 do
639 cp ${f} ${T}/edos2unix 672 cp "${f}" ${T}/edos2unix
640 sed 's/\r$//' ${T}/edos2unix > ${f} 673 sed 's/\r$//' ${T}/edos2unix > "${f}"
641 done 674 done
642} 675}
643 676
644# Make a desktop file ! 677# Make a desktop file !
645# Great for making those icons in kde/gnome startmenu ! 678# Great for making those icons in kde/gnome startmenu !
… …
659# http://www.freedesktop.org/standards/menu/draft/menu-spec/menu-spec.html 692# http://www.freedesktop.org/standards/menu/draft/menu-spec/menu-spec.html
660# path: if your app needs to startup in a specific dir 693# path: if your app needs to startup in a specific dir
661make_desktop_entry() { 694make_desktop_entry() {
662 [ -z "$1" ] && eerror "You must specify the executable" && return 1 695 [ -z "$1" ] && eerror "You must specify the executable" && return 1
663 696
664 local exec=${1} 697 local exec="${1}"
665 local name=${2:-${PN}} 698 local name="${2:-${PN}}"
666 local icon=${3:-${PN}.png} 699 local icon="${3:-${PN}.png}"
667 local type=${4} 700 local type="${4}"
668 local path=${5:-${GAMES_PREFIX}} 701 local path="${5:-${GAMES_PREFIX}}"
669 if [ -z "${type}" ] ; then 702 if [ -z "${type}" ]
703 then
670 case ${CATEGORY} in 704 case ${CATEGORY} in
671 app-emulation) type=Emulator ;; 705 "app-emulation")
672 app-games) type=Game ;; 706 type=Emulator
673 *) type="" ;; 707 ;;
708 "games-"*)
709 type=Game
710 ;;
711 *)
712 type=
713 ;;
674 esac 714 esac
675 fi 715 fi
676 local desktop=${T}/${exec}.desktop 716 local desktop="${T}/${exec}.desktop"
677 717
678echo "[Desktop Entry] 718echo "[Desktop Entry]
679Encoding=UTF-8 719Encoding=UTF-8
680Version=0.9.2 720Version=0.9.2
681Name=${name} 721Name=${name}
… …
684Exec=${exec} 724Exec=${exec}
685Path=${path} 725Path=${path}
686Icon=${icon} 726Icon=${icon}
687Categories=Application;${type};" > ${desktop} 727Categories=Application;${type};" > ${desktop}
688 728
689 if [ -d /usr/share/applications ] ; then 729 if [ -d "/usr/share/applications" ]
730 then
690 insinto /usr/share/applications 731 insinto /usr/share/applications
691 doins ${desktop} 732 doins ${desktop}
692 fi 733 fi
693 734
694 #if [ -d /usr/share/gnome/apps ] ; then 735 #if [ -d "/usr/share/gnome/apps" ]
736 #then
695 # insinto /usr/share/gnome/apps/Games 737 # insinto /usr/share/gnome/apps/Games
696 # doins ${desktop} 738 # doins ${desktop}
697 #fi 739 #fi
698 740
699 #if [ ! -z "`ls /usr/kde/* 2>/dev/null`" ] ; then 741 #if [ ! -z "`ls /usr/kde/* 2>/dev/null`" ]
742 #then
700 # for ver in /usr/kde/* ; do 743 # for ver in /usr/kde/*
744 # do
701 # insinto ${ver}/share/applnk/Games 745 # insinto ${ver}/share/applnk/Games
702 # doins ${desktop} 746 # doins ${desktop}
703 # done 747 # done
704 #fi 748 #fi
705 749
706 if [ -d /usr/share/applnk ] ; then 750 if [ -d "/usr/share/applnk" ]
751 then
707 insinto /usr/share/applnk/${type} 752 insinto /usr/share/applnk/${type}
708 doins ${desktop} 753 doins ${desktop}
709 fi 754 fi
710 755
711 return 0 756 return 0
… …
735# writing the ebuild, it'll always work for the users, and if it doesn't, 780# writing the ebuild, it'll always work for the users, and if it doesn't,
736# then we'll fix it :-) 781# then we'll fix it :-)
737# - no support as yet for patches applying outside $S (and not directly in $WORKDIR). 782# - no support as yet for patches applying outside $S (and not directly in $WORKDIR).
738xpatch() { 783xpatch() {
739 784
740 debug-print-function $FUNCNAME $* 785 debug-print-function ${FUNCNAME} $*
741 786
742 local list="" 787 local list=
743 local list2="" 788 local list2=
744 declare -i plevel 789 declare -i plevel
745 790
746 # parse patch sources 791 # parse patch sources
747 for x in $*; do 792 for x in $*
793 do
748 debug-print "$FUNCNAME: parsing parameter $x" 794 debug-print "${FUNCNAME}: parsing parameter ${x}"
749 if [ -f "$x" ]; then 795 if [ -f "${x}" ]
796 then
750 list="$list $x" 797 list="${list} ${x}"
751 elif [ -d "$x" ]; then 798 elif [ -d "${x}" ]
799 then
752 # handles patchdirs like epatch() for now: no recursion. 800 # handles patchdirs like epatch() for now: no recursion.
753 # patches are sorted by filename, so with an xy_foo naming scheme you'll get the right order. 801 # patches are sorted by filename, so with an xy_foo naming scheme you'll get the right order.
754 # only patches with _$ARCH_ or _all_ in their filenames are applied. 802 # only patches with _$ARCH_ or _all_ in their filenames are applied.
755 for file in `ls -A $x`; do 803 for file in `ls -A ${x}`
804 do
756 debug-print "$FUNCNAME: parsing in subdir: file $file" 805 debug-print "${FUNCNAME}: parsing in subdir: file ${file}"
757 if [ -f "$x/$file" ] && [ "${file}" != "${file/_all_}" -o "${file}" != "${file/_$ARCH_}" ]; then 806 if [ -f "${x}/${file}" -a "${file}" != "${file/_all_}" -o \
807 "${file}" != "${file/_$ARCH_}" ]
808 then
758 list2="$list2 $x/$file" 809 list2="${list2} ${x}/${file}"
759 fi 810 fi
760 done 811 done
761 list="`echo $list2 | sort` $list" 812 list="`echo ${list2} | sort` ${list}"
762 else 813 else
763 die "Couldn't find $x" 814 die "Couldn't find ${x}"
764 fi 815 fi
765 done 816 done
766 817
767 debug-print "$FUNCNAME: final list of patches: $list" 818 debug-print "${FUNCNAME}: final list of patches: ${list}"
768 819
769 for x in $list; do 820 for x in ${list};
821 do
770 debug-print "$FUNCNAME: processing $x" 822 debug-print "${FUNCNAME}: processing ${x}"
771 # deal with compressed files. /usr/bin/file is in the system profile, or should be. 823 # deal with compressed files. /usr/bin/file is in the system profile, or should be.
772 case "`/usr/bin/file -b $x`" in 824 case "`/usr/bin/file -b ${x}`" in
773 *gzip*) patchfile="${T}/current.patch"; ungzip -c "$x" > "${patchfile}";; 825 *gzip*)
774 *bzip2*) patchfile="${T}/current.patch"; bunzip2 -c "$x" > "${patchfile}";; 826 patchfile="${T}/current.patch"
775 *text*) patchfile="$x";; 827 ungzip -c "${x}" > "${patchfile}"
828 ;;
829 *bzip2*)
830 patchfile="${T}/current.patch"
831 bunzip2 -c "${x}" > "${patchfile}"
832 ;;
833 *text*)
834 patchfile="${x}"
835 ;;
836 *)
776 *) die "Could not determine filetype of patch $x";; 837 die "Could not determine filetype of patch ${x}"
838 ;;
777 esac 839 esac
778 debug-print "$FUNCNAME: patchfile=$patchfile" 840 debug-print "${FUNCNAME}: patchfile=${patchfile}"
779 841
780 # determine patchlevel. supports p0 and higher with either $S or $WORKDIR as base. 842 # determine patchlevel. supports p0 and higher with either $S or $WORKDIR as base.
781 target="`/bin/grep -m 1 '^+++ ' $patchfile`" 843 target="`/bin/grep -m 1 '^+++ ' ${patchfile}`"
782 debug-print "$FUNCNAME: raw target=$target" 844 debug-print "${FUNCNAME}: raw target=${target}"
783 # strip target down to the path/filename, remove leading +++ 845 # strip target down to the path/filename, remove leading +++
784 target="${target/+++ }"; target="${target%% *}" 846 target="${target/+++ }"; target="${target%% *}"
785 # duplicate slashes are discarded by patch wrt the patchlevel. therefore we need 847 # duplicate slashes are discarded by patch wrt the patchlevel. therefore we need
786 # to discard them as well to calculate the correct patchlevel. 848 # to discard them as well to calculate the correct patchlevel.
787 target="${target//\/\//\/}" 849 target="${target//\/\//\/}"
788 debug-print "$FUNCNAME: stripped target=$target" 850 debug-print "${FUNCNAME}: stripped target=${target}"
789 851
790 # look for target 852 # look for target
791 for basedir in "$S" "$WORKDIR" "${PWD}"; do 853 for basedir in "${S}" "${WORKDIR}" "${PWD}"; do
792 debug-print "$FUNCNAME: looking in basedir=$basedir" 854 debug-print "${FUNCNAME}: looking in basedir=${basedir}"
793 cd "$basedir" 855 cd "${basedir}"
794 856
795 # try stripping leading directories 857 # try stripping leading directories
796 target2="$target" 858 target2="${target}"
797 plevel=0 859 plevel=0
798 debug-print "$FUNCNAME: trying target2=$target2, plevel=$plevel" 860 debug-print "${FUNCNAME}: trying target2=${target2}, plevel=${plevel}"
799 while [ ! -f "$target2" ]; do 861 while [ ! -f "${target2}" ]
862 do
800 target2="${target2#*/}" # removes piece of target2 upto the first occurence of / 863 target2="${target2#*/}" # removes piece of target2 upto the first occurence of /
801 plevel=plevel+1 864 plevel=$((plevel+1))
802 debug-print "$FUNCNAME: trying target2=$target2, plevel=$plevel" 865 debug-print "${FUNCNAME}: trying target2=${target2}, plevel=${plevel}"
803 [ "$target2" == "${target2/\/}" ] && break 866 [ "${target2}" == "${target2/\/}" ] && break
804 done 867 done
805 test -f "$target2" && break 868 test -f "${target2}" && break
806 869
807 # try stripping filename - needed to support patches creating new files 870 # try stripping filename - needed to support patches creating new files
808 target2="${target%/*}" 871 target2="${target%/*}"
809 plevel=0 872 plevel=0
810 debug-print "$FUNCNAME: trying target2=$target2, plevel=$plevel" 873 debug-print "${FUNCNAME}: trying target2=${target2}, plevel=${plevel}"
811 while [ ! -d "$target2" ]; do 874 while [ ! -d "${target2}" ]
875 do
812 target2="${target2#*/}" # removes piece of target2 upto the first occurence of / 876 target2="${target2#*/}" # removes piece of target2 upto the first occurence of /
813 plevel=plevel+1 877 plevel=$((plevel+1))
814 debug-print "$FUNCNAME: trying target2=$target2, plevel=$plevel" 878 debug-print "${FUNCNAME}: trying target2=${target2}, plevel=${plevel}"
815 [ "$target2" == "${target2/\/}" ] && break 879 [ "${target2}" == "${target2/\/}" ] && break
816 done 880 done
817 test -d "$target2" && break 881 test -d "${target2}" && break
818 882
819 done 883 done
820 884
821 test -f "${basedir}/${target2}" || test -d "${basedir}/${target2}" || die "Could not determine patchlevel for $x" 885 test -f "${basedir}/${target2}" || test -d "${basedir}/${target2}" \
886 || die "Could not determine patchlevel for ${x}"
822 debug-print "$FUNCNAME: determined plevel=$plevel" 887 debug-print "${FUNCNAME}: determined plevel=${plevel}"
823 # do the patching 888 # do the patching
824 ebegin "Applying patch ${x##*/}..." 889 ebegin "Applying patch ${x##*/}..."
825 /usr/bin/patch -p$plevel < "$patchfile" > /dev/null || die "Failed to apply patch $x" 890 /usr/bin/patch -p${plevel} < "${patchfile}" > /dev/null \
891 || die "Failed to apply patch ${x}"
826 eend $? 892 eend $?
827 893
828 done 894 done
829 895
830} 896}
… …
837# Usage: unpack_makeself [file to unpack] [offset] 903# Usage: unpack_makeself [file to unpack] [offset]
838# - If the file is not specified then unpack will utilize ${A}. 904# - If the file is not specified then unpack will utilize ${A}.
839# - If the offset is not specified then we will attempt to extract 905# - If the offset is not specified then we will attempt to extract
840# the proper offset from the script itself. 906# the proper offset from the script itself.
841unpack_makeself() { 907unpack_makeself() {
842 local src=$1 908 local src="$1"
843 local skip=$2 909 local skip="$2"
844 910
845 [ -z "${src}" ] && src=${A} 911 if [ -z "${src}" ]
846 [ -e ./${src} ] \ 912 then
847 && src=${PWD}/${src} \ 913 src="${DISTDIR}/${A}"
914 else
915 if [ -e "${DISTDIR}/${src}" ]
916 then
848 || src=${DISTDIR}/${src} 917 src="${DISTDIR}/${src}"
918 elif [ -e "${PWD}/${src}" ]
919 then
920 src="${PWD}/${src}"
921 elif [ -e "${src}" ]
922 then
923 src="${src}"
924 fi
925 fi
926 [ ! -e "${src}" ] && die "Could not find requested makeself archive ${src}"
927
849 local shrtsrc=`basename ${src}` 928 local shrtsrc="`basename ${src}`"
850 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 929 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
851 if [ -z "${skip}" ] ; then 930 if [ -z "${skip}" ]
931 then
852 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 932 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
853 local skip=0 933 local skip=0
854 case ${ver} in 934 case ${ver} in
855 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 935 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
856 skip=`grep -a ^skip= ${src} | cut -d= -f2` 936 skip=`grep -a ^skip= ${src} | cut -d= -f2`
… …
858 2.0|2.0.1) 938 2.0|2.0.1)
859 skip=`grep -a ^$'\t'tail ${src} | awk '{print $2}' | cut -b2-` 939 skip=`grep -a ^$'\t'tail ${src} | awk '{print $2}' | cut -b2-`
860 ;; 940 ;;
861 2.1.1) 941 2.1.1)
862 skip=`grep -a ^offset= ${src} | awk '{print $2}' | cut -b2-` 942 skip=`grep -a ^offset= ${src} | awk '{print $2}' | cut -b2-`
943 let skip="skip + 1"
944 ;;
945 2.1.2)
946 skip=`grep -a ^offset= ${src} | awk '{print $3}' | head -n 1`
947 let skip="skip + 1"
948 ;;
949 2.1.3)
950 skip=`grep -a ^offset= ${src} | awk '{print $3}'`
863 let skip="skip + 1" 951 let skip="skip + 1"
864 ;; 952 ;;
865 *) 953 *)
866 eerror "I'm sorry, but I was unable to support the Makeself file." 954 eerror "I'm sorry, but I was unable to support the Makeself file."
867 eerror "The version I detected was '${ver}'." 955 eerror "The version I detected was '${ver}'."
… …
873 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 961 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
874 fi 962 fi
875 963
876 # we do this because otherwise a failure in gzip will cause 0 bytes to be sent 964 # we do this because otherwise a failure in gzip will cause 0 bytes to be sent
877 # to tar which will make tar not extract anything and exit with 0 965 # to tar which will make tar not extract anything and exit with 0
878 local out="`tail +${skip} ${src} | gzip -cd | tar -x --no-same-owner -v -f -`" 966 tail -n +${skip} ${src} | gzip -cd | tar -x --no-same-owner -f - 2>/dev/null
967 local pipestatus="${PIPESTATUS[*]}"
968 pipestatus="${pipestatus// }"
969 if [ "${pipestatus//0}" != "" ]
970 then
971 # maybe it isnt gzipped ... they usually are, but not always ...
972 tail -n +${skip} ${src} | tar -x --no-same-owner -f - \
879 [ -z "${out}" ] && die "failure unpacking makeself ${shrtsrc} ('${ver}' +${skip})" 973 || die "failure unpacking makeself ${shrtsrc} ('${ver}' +${skip})"
974 fi
880} 975}
976
977# Display a license for user to accept.
978#
979# Usage: check_license [license]
980# - If the file is not specified then ${LICENSE} is used.
981check_license() {
982 local lic=$1
983 if [ -z "${lic}" ] ; then
984 lic="${PORTDIR}/licenses/${LICENSE}"
985 else
986 if [ -e "${PORTDIR}/licenses/${src}" ] ; then
987 lic="${PORTDIR}/licenses/${src}"
988 elif [ -e "${PWD}/${src}" ] ; then
989 lic="${PWD}/${src}"
990 elif [ -e "${src}" ] ; then
991 lic="${src}"
992 fi
993 fi
994 [ ! -f "${lic}" ] && die "Could not find requested license ${src}"
995
996 # here is where we check for the licenses the user already
997 # accepted ... if we don't find a match, we make the user accept
998 local alic
999 for alic in ${ACCEPT_LICENSE} ; do
1000 [ "${alic}" == "*" ] && return 0
1001 [ "${alic}" == "${lic}" ] && return 0
1002 done
1003
1004 local licmsg="`mymktemp ${T}`"
1005 cat << EOF > ${licmsg}
1006**********************************************************
1007The following license outlines the terms of use of this
1008package. You MUST accept this license for installation to
1009continue. When you are done viewing, hit 'q'. If you
1010CTRL+C out of this, the install will not run!
1011**********************************************************
1012
1013EOF
1014 cat ${lic} >> ${licmsg}
1015 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}"
1016 einfon "Do you accept the terms of this license? [yes/no] "
1017 read alic
1018 case ${alic} in
1019 yes|Yes|y|Y)
1020 return 0
1021 ;;
1022 *)
1023 echo;echo;echo
1024 eerror "You MUST accept the license to continue! Exiting!"
1025 die "Failed to accept license"
1026 ;;
1027 esac
1028}
Legend:
Removed from v.1.41  
changed lines
  Added in v.1.61
  ViewVC Help
Powered by ViewVC 1.1.13