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

Diff of /eclass/eutils.eclass

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

Revision 1.56 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.56 2003/09/22 21:08:27 wolf31o2 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.
461# do not exist on the users system 461# do not exist on the users system
462# vapier@gentoo.org 462# vapier@gentoo.org
463# 463#
464# Takes just 1 parameter (the directory to create tmpfile in) 464# Takes just 1 parameter (the directory to create tmpfile in)
465mymktemp() { 465mymktemp() {
466 local topdir=$1 466 local topdir="$1"
467
467 [ -z "${topdir}" ] && topdir=/tmp 468 [ -z "${topdir}" ] && topdir=/tmp
468 if [ `which mktemp 2>/dev/null` ] ; then 469 if [ "`which mktemp 2>/dev/null`" ]
470 then
469 mktemp -p ${topdir} 471 mktemp -p ${topdir}
470 else 472 else
471 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 473 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
472 touch ${tmp} 474 touch ${tmp}
473 echo ${tmp} 475 echo ${tmp}
488# groups: none 490# groups: none
489# extra: comment of 'added by portage for ${PN}' 491# extra: comment of 'added by portage for ${PN}'
490enewuser() { 492enewuser() {
491 # get the username 493 # get the username
492 local euser="$1"; shift 494 local euser="$1"; shift
493 if [ -z "${euser}" ] ; then 495 if [ -z "${euser}" ]
496 then
494 eerror "No username specified !" 497 eerror "No username specified !"
495 die "Cannot call enewuser without a username" 498 die "Cannot call enewuser without a username"
496 fi 499 fi
497 500
498 # setup a file for testing usernames/groups 501 # setup a file for testing usernames/groups
499 local tmpfile="`mymktemp ${T}`" 502 local tmpfile="`mymktemp ${T}`"
500 chown ${euser} ${tmpfile} >& /dev/null 503 chown ${euser} ${tmpfile} >& /dev/null
501 local realuser="`ls -l ${tmpfile} | awk '{print $3}'`" 504 local realuser="`ls -l ${tmpfile} | awk '{print $3}'`"
502 505
503 # see if user already exists 506 # see if user already exists
504 if [ "${euser}" == "${realuser}" ] ; then 507 if [ "${euser}" == "${realuser}" ]
508 then
505 return 0 509 return 0
506 fi 510 fi
507 einfo "Adding user '${euser}' to your system ..." 511 einfo "Adding user '${euser}' to your system ..."
508 512
509 # options to pass to useradd 513 # options to pass to useradd
510 local opts="" 514 local opts=
511 515
512 # handle uid 516 # handle uid
513 local euid="$1"; shift 517 local euid="$1"; shift
514 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] ; then 518 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ]
519 then
515 if [ ${euid} -gt 0 ] ; then 520 if [ "${euid}" -gt 0 ]
521 then
516 opts="${opts} -u ${euid}" 522 opts="${opts} -u ${euid}"
517 else 523 else
518 eerror "Userid given but is not greater than 0 !" 524 eerror "Userid given but is not greater than 0 !"
519 die "${euid} is not a valid UID" 525 die "${euid} is not a valid UID"
520 fi 526 fi
523 fi 529 fi
524 einfo " - Userid: ${euid}" 530 einfo " - Userid: ${euid}"
525 531
526 # handle shell 532 # handle shell
527 local eshell="$1"; shift 533 local eshell="$1"; shift
528 if [ ! -z "${eshell}" ] ; then 534 if [ ! -z "${eshell}" ]
535 then
529 if [ ! -e ${eshell} ] ; then 536 if [ ! -e "${eshell}" ]
537 then
530 eerror "A shell was specified but it does not exist !" 538 eerror "A shell was specified but it does not exist !"
531 die "${eshell} does not exist" 539 die "${eshell} does not exist"
532 fi 540 fi
533 else 541 else
534 eshell=/bin/false 542 eshell="/bin/false"
535 fi 543 fi
536 einfo " - Shell: ${eshell}" 544 einfo " - Shell: ${eshell}"
537 opts="${opts} -s ${eshell}" 545 opts="${opts} -s ${eshell}"
538 546
539 # handle homedir 547 # handle homedir
540 local ehome="$1"; shift 548 local ehome="$1"; shift
541 if [ -z "${ehome}" ] ; then 549 if [ -z "${ehome}" ]
550 then
542 ehome=/dev/null 551 ehome="/dev/null"
543 fi 552 fi
544 einfo " - Home: ${ehome}" 553 einfo " - Home: ${ehome}"
545 opts="${opts} -d ${ehome}" 554 opts="${opts} -d ${ehome}"
546 555
547 # handle groups 556 # handle groups
548 local egroups="$1"; shift 557 local egroups="$1"; shift
549 if [ ! -z "${egroups}" ] ; then 558 if [ ! -z "${egroups}" ]
559 then
550 local realgroup 560 local realgroup=
551 local oldifs="${IFS}" 561 local oldifs="${IFS}"
552 export IFS="," 562 export IFS=","
553 for g in ${egroups} ; do 563 for g in ${egroups}
564 do
554 chgrp ${g} ${tmpfile} >& /dev/null 565 chgrp ${g} ${tmpfile} >& /dev/null
555 realgroup="`ls -l ${tmpfile} | awk '{print $4}'`" 566 realgroup="`ls -l ${tmpfile} | awk '{print $4}'`"
556 if [ "${g}" != "${realgroup}" ] ; then 567 if [ "${g}" != "${realgroup}" ]
568 then
557 eerror "You must add ${g} to the system first" 569 eerror "You must add ${g} to the system first"
558 die "${g} is not a valid GID" 570 die "${g} is not a valid GID"
559 fi 571 fi
560 done 572 done
561 export IFS="${oldifs}" 573 export IFS="${oldifs}"
565 fi 577 fi
566 einfo " - Groups: ${egroups}" 578 einfo " - Groups: ${egroups}"
567 579
568 # handle extra and add the user 580 # handle extra and add the user
569 local eextra="$@" 581 local eextra="$@"
570 local oldsandbox=${SANDBOX_ON} 582 local oldsandbox="${SANDBOX_ON}"
571 export SANDBOX_ON="0" 583 export SANDBOX_ON="0"
572 if [ -z "${eextra}" ] ; then 584 if [ -z "${eextra}" ]
585 then
573 useradd ${opts} ${euser} \ 586 useradd ${opts} ${euser} \
574 -c "added by portage for ${PN}" \ 587 -c "added by portage for ${PN}" \
575 || die "enewuser failed" 588 || die "enewuser failed"
576 else 589 else
577 einfo " - Extra: ${eextra}" 590 einfo " - Extra: ${eextra}"
578 useradd ${opts} ${euser} ${eextra} \ 591 useradd ${opts} ${euser} ${eextra} \
579 || die "enewuser failed" 592 || die "enewuser failed"
580 fi 593 fi
581 export SANDBOX_ON="${oldsandbox}" 594 export SANDBOX_ON="${oldsandbox}"
582 595
583 if [ ! -e ${ehome} ] && [ ! -e ${D}/${ehome} ] ; then 596 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
597 then
584 einfo " - Creating ${ehome} in ${D}" 598 einfo " - Creating ${ehome} in ${D}"
585 dodir ${ehome} 599 dodir ${ehome}
586 fowners ${euser} ${ehome} 600 fowners ${euser} ${ehome}
587 fperms 755 ${ehome} 601 fperms 755 ${ehome}
588 fi 602 fi
598# gid: next available (see groupadd(8)) 612# gid: next available (see groupadd(8))
599# extra: none 613# extra: none
600enewgroup() { 614enewgroup() {
601 # get the group 615 # get the group
602 local egroup="$1"; shift 616 local egroup="$1"; shift
603 if [ -z "${egroup}" ] ; then 617 if [ -z "${egroup}" ]
618 then
604 eerror "No group specified !" 619 eerror "No group specified !"
605 die "Cannot call enewgroup without a group" 620 die "Cannot call enewgroup without a group"
606 fi 621 fi
607 622
608 # setup a file for testing groupname 623 # setup a file for testing groupname
609 local tmpfile="`mymktemp ${T}`" 624 local tmpfile="`mymktemp ${T}`"
610 chgrp ${egroup} ${tmpfile} >& /dev/null 625 chgrp ${egroup} ${tmpfile} >& /dev/null
611 local realgroup="`ls -l ${tmpfile} | awk '{print $4}'`" 626 local realgroup="`ls -l ${tmpfile} | awk '{print $4}'`"
612 627
613 # see if group already exists 628 # see if group already exists
614 if [ "${egroup}" == "${realgroup}" ] ; then 629 if [ "${egroup}" == "${realgroup}" ]
630 then
615 return 0 631 return 0
616 fi 632 fi
617 einfo "Adding group '${egroup}' to your system ..." 633 einfo "Adding group '${egroup}' to your system ..."
618 634
619 # options to pass to useradd 635 # options to pass to useradd
620 local opts="" 636 local opts=
621 637
622 # handle gid 638 # handle gid
623 local egid="$1"; shift 639 local egid="$1"; shift
624 if [ ! -z "${egid}" ] ; then 640 if [ ! -z "${egid}" ]
641 then
625 if [ ${egid} -gt 0 ] ; then 642 if [ "${egid}" -gt 0 ]
643 then
626 opts="${opts} -g ${egid}" 644 opts="${opts} -g ${egid}"
627 else 645 else
628 eerror "Groupid given but is not greater than 0 !" 646 eerror "Groupid given but is not greater than 0 !"
629 die "${egid} is not a valid GID" 647 die "${egid} is not a valid GID"
630 fi 648 fi
636 # handle extra 654 # handle extra
637 local eextra="$@" 655 local eextra="$@"
638 opts="${opts} ${eextra}" 656 opts="${opts} ${eextra}"
639 657
640 # add the group 658 # add the group
641 local oldsandbox=${SANDBOX_ON} 659 local oldsandbox="${SANDBOX_ON}"
642 export SANDBOX_ON="0" 660 export SANDBOX_ON="0"
643 groupadd ${opts} ${egroup} || die "enewgroup failed" 661 groupadd ${opts} ${egroup} || die "enewgroup failed"
644 export SANDBOX_ON="${oldsandbox}" 662 export SANDBOX_ON="${oldsandbox}"
645} 663}
646 664
647# Simple script to replace 'dos2unix' binaries 665# Simple script to replace 'dos2unix' binaries
648# vapier@gentoo.org 666# vapier@gentoo.org
649# 667#
650# edos2unix(file, <more files>...) 668# edos2unix(file, <more files>...)
651edos2unix() { 669edos2unix() {
652 for f in $@ ; do 670 for f in "$@"
671 do
653 cp ${f} ${T}/edos2unix 672 cp "${f}" ${T}/edos2unix
654 sed 's/\r$//' ${T}/edos2unix > ${f} 673 sed 's/\r$//' ${T}/edos2unix > "${f}"
655 done 674 done
656} 675}
657 676
658# Make a desktop file ! 677# Make a desktop file !
659# Great for making those icons in kde/gnome startmenu ! 678# Great for making those icons in kde/gnome startmenu !
673# 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
674# path: if your app needs to startup in a specific dir 693# path: if your app needs to startup in a specific dir
675make_desktop_entry() { 694make_desktop_entry() {
676 [ -z "$1" ] && eerror "You must specify the executable" && return 1 695 [ -z "$1" ] && eerror "You must specify the executable" && return 1
677 696
678 local exec=${1} 697 local exec="${1}"
679 local name=${2:-${PN}} 698 local name="${2:-${PN}}"
680 local icon=${3:-${PN}.png} 699 local icon="${3:-${PN}.png}"
681 local type=${4} 700 local type="${4}"
682 local path=${5:-${GAMES_PREFIX}} 701 local path="${5:-${GAMES_PREFIX}}"
683 if [ -z "${type}" ] ; then 702 if [ -z "${type}" ]
703 then
684 case ${CATEGORY} in 704 case ${CATEGORY} in
685 app-emulation) type=Emulator ;; 705 "app-emulation")
686 games-*) type=Game ;; 706 type=Emulator
687 *) type="" ;; 707 ;;
708 "games-"*)
709 type=Game
710 ;;
711 *)
712 type=
713 ;;
688 esac 714 esac
689 fi 715 fi
690 local desktop=${T}/${exec}.desktop 716 local desktop="${T}/${exec}.desktop"
691 717
692echo "[Desktop Entry] 718echo "[Desktop Entry]
693Encoding=UTF-8 719Encoding=UTF-8
694Version=0.9.2 720Version=0.9.2
695Name=${name} 721Name=${name}
698Exec=${exec} 724Exec=${exec}
699Path=${path} 725Path=${path}
700Icon=${icon} 726Icon=${icon}
701Categories=Application;${type};" > ${desktop} 727Categories=Application;${type};" > ${desktop}
702 728
703 if [ -d /usr/share/applications ] ; then 729 if [ -d "/usr/share/applications" ]
730 then
704 insinto /usr/share/applications 731 insinto /usr/share/applications
705 doins ${desktop} 732 doins ${desktop}
706 fi 733 fi
707 734
708 #if [ -d /usr/share/gnome/apps ] ; then 735 #if [ -d "/usr/share/gnome/apps" ]
736 #then
709 # insinto /usr/share/gnome/apps/Games 737 # insinto /usr/share/gnome/apps/Games
710 # doins ${desktop} 738 # doins ${desktop}
711 #fi 739 #fi
712 740
713 #if [ ! -z "`ls /usr/kde/* 2>/dev/null`" ] ; then 741 #if [ ! -z "`ls /usr/kde/* 2>/dev/null`" ]
742 #then
714 # for ver in /usr/kde/* ; do 743 # for ver in /usr/kde/*
744 # do
715 # insinto ${ver}/share/applnk/Games 745 # insinto ${ver}/share/applnk/Games
716 # doins ${desktop} 746 # doins ${desktop}
717 # done 747 # done
718 #fi 748 #fi
719 749
720 if [ -d /usr/share/applnk ] ; then 750 if [ -d "/usr/share/applnk" ]
751 then
721 insinto /usr/share/applnk/${type} 752 insinto /usr/share/applnk/${type}
722 doins ${desktop} 753 doins ${desktop}
723 fi 754 fi
724 755
725 return 0 756 return 0
749# 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,
750# then we'll fix it :-) 781# then we'll fix it :-)
751# - 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).
752xpatch() { 783xpatch() {
753 784
754 debug-print-function $FUNCNAME $* 785 debug-print-function ${FUNCNAME} $*
755 786
756 local list="" 787 local list=
757 local list2="" 788 local list2=
758 declare -i plevel 789 declare -i plevel
759 790
760 # parse patch sources 791 # parse patch sources
761 for x in $*; do 792 for x in $*
793 do
762 debug-print "$FUNCNAME: parsing parameter $x" 794 debug-print "${FUNCNAME}: parsing parameter ${x}"
763 if [ -f "$x" ]; then 795 if [ -f "${x}" ]
796 then
764 list="$list $x" 797 list="${list} ${x}"
765 elif [ -d "$x" ]; then 798 elif [ -d "${x}" ]
799 then
766 # handles patchdirs like epatch() for now: no recursion. 800 # handles patchdirs like epatch() for now: no recursion.
767 # 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.
768 # only patches with _$ARCH_ or _all_ in their filenames are applied. 802 # only patches with _$ARCH_ or _all_ in their filenames are applied.
769 for file in `ls -A $x`; do 803 for file in `ls -A ${x}`
804 do
770 debug-print "$FUNCNAME: parsing in subdir: file $file" 805 debug-print "${FUNCNAME}: parsing in subdir: file ${file}"
771 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
772 list2="$list2 $x/$file" 809 list2="${list2} ${x}/${file}"
773 fi 810 fi
774 done 811 done
775 list="`echo $list2 | sort` $list" 812 list="`echo ${list2} | sort` ${list}"
776 else 813 else
777 die "Couldn't find $x" 814 die "Couldn't find ${x}"
778 fi 815 fi
779 done 816 done
780 817
781 debug-print "$FUNCNAME: final list of patches: $list" 818 debug-print "${FUNCNAME}: final list of patches: ${list}"
782 819
783 for x in $list; do 820 for x in ${list};
821 do
784 debug-print "$FUNCNAME: processing $x" 822 debug-print "${FUNCNAME}: processing ${x}"
785 # 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.
786 case "`/usr/bin/file -b $x`" in 824 case "`/usr/bin/file -b ${x}`" in
787 *gzip*) patchfile="${T}/current.patch"; ungzip -c "$x" > "${patchfile}";; 825 *gzip*)
788 *bzip2*) patchfile="${T}/current.patch"; bunzip2 -c "$x" > "${patchfile}";; 826 patchfile="${T}/current.patch"
789 *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 *)
790 *) die "Could not determine filetype of patch $x";; 837 die "Could not determine filetype of patch ${x}"
838 ;;
791 esac 839 esac
792 debug-print "$FUNCNAME: patchfile=$patchfile" 840 debug-print "${FUNCNAME}: patchfile=${patchfile}"
793 841
794 # 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.
795 target="`/bin/grep -m 1 '^+++ ' $patchfile`" 843 target="`/bin/grep -m 1 '^+++ ' ${patchfile}`"
796 debug-print "$FUNCNAME: raw target=$target" 844 debug-print "${FUNCNAME}: raw target=${target}"
797 # strip target down to the path/filename, remove leading +++ 845 # strip target down to the path/filename, remove leading +++
798 target="${target/+++ }"; target="${target%% *}" 846 target="${target/+++ }"; target="${target%% *}"
799 # 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
800 # to discard them as well to calculate the correct patchlevel. 848 # to discard them as well to calculate the correct patchlevel.
801 target="${target//\/\//\/}" 849 target="${target//\/\//\/}"
802 debug-print "$FUNCNAME: stripped target=$target" 850 debug-print "${FUNCNAME}: stripped target=${target}"
803 851
804 # look for target 852 # look for target
805 for basedir in "$S" "$WORKDIR" "${PWD}"; do 853 for basedir in "${S}" "${WORKDIR}" "${PWD}"; do
806 debug-print "$FUNCNAME: looking in basedir=$basedir" 854 debug-print "${FUNCNAME}: looking in basedir=${basedir}"
807 cd "$basedir" 855 cd "${basedir}"
808 856
809 # try stripping leading directories 857 # try stripping leading directories
810 target2="$target" 858 target2="${target}"
811 plevel=0 859 plevel=0
812 debug-print "$FUNCNAME: trying target2=$target2, plevel=$plevel" 860 debug-print "${FUNCNAME}: trying target2=${target2}, plevel=${plevel}"
813 while [ ! -f "$target2" ]; do 861 while [ ! -f "${target2}" ]
862 do
814 target2="${target2#*/}" # removes piece of target2 upto the first occurence of / 863 target2="${target2#*/}" # removes piece of target2 upto the first occurence of /
815 plevel=plevel+1 864 plevel=$((plevel+1))
816 debug-print "$FUNCNAME: trying target2=$target2, plevel=$plevel" 865 debug-print "${FUNCNAME}: trying target2=${target2}, plevel=${plevel}"
817 [ "$target2" == "${target2/\/}" ] && break 866 [ "${target2}" == "${target2/\/}" ] && break
818 done 867 done
819 test -f "$target2" && break 868 test -f "${target2}" && break
820 869
821 # try stripping filename - needed to support patches creating new files 870 # try stripping filename - needed to support patches creating new files
822 target2="${target%/*}" 871 target2="${target%/*}"
823 plevel=0 872 plevel=0
824 debug-print "$FUNCNAME: trying target2=$target2, plevel=$plevel" 873 debug-print "${FUNCNAME}: trying target2=${target2}, plevel=${plevel}"
825 while [ ! -d "$target2" ]; do 874 while [ ! -d "${target2}" ]
875 do
826 target2="${target2#*/}" # removes piece of target2 upto the first occurence of / 876 target2="${target2#*/}" # removes piece of target2 upto the first occurence of /
827 plevel=plevel+1 877 plevel=$((plevel+1))
828 debug-print "$FUNCNAME: trying target2=$target2, plevel=$plevel" 878 debug-print "${FUNCNAME}: trying target2=${target2}, plevel=${plevel}"
829 [ "$target2" == "${target2/\/}" ] && break 879 [ "${target2}" == "${target2/\/}" ] && break
830 done 880 done
831 test -d "$target2" && break 881 test -d "${target2}" && break
832 882
833 done 883 done
834 884
835 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}"
836 debug-print "$FUNCNAME: determined plevel=$plevel" 887 debug-print "${FUNCNAME}: determined plevel=${plevel}"
837 # do the patching 888 # do the patching
838 ebegin "Applying patch ${x##*/}..." 889 ebegin "Applying patch ${x##*/}..."
839 /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}"
840 eend $? 892 eend $?
841 893
842 done 894 done
843 895
844} 896}
851# Usage: unpack_makeself [file to unpack] [offset] 903# Usage: unpack_makeself [file to unpack] [offset]
852# - If the file is not specified then unpack will utilize ${A}. 904# - If the file is not specified then unpack will utilize ${A}.
853# - 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
854# the proper offset from the script itself. 906# the proper offset from the script itself.
855unpack_makeself() { 907unpack_makeself() {
856 local src=$1 908 local src="$1"
857 local skip=$2 909 local skip="$2"
858 910
859 if [ -z "${src}" ] ; then 911 if [ -z "${src}" ]
912 then
860 src="${DISTDIR}/${A}" 913 src="${DISTDIR}/${A}"
861 else 914 else
862 if [ -e "${DISTDIR}/${src}" ] ; then 915 if [ -e "${DISTDIR}/${src}" ]
916 then
863 src="${DISTDIR}/${src}" 917 src="${DISTDIR}/${src}"
864 elif [ -e "${PWD}/${src}" ] ; then 918 elif [ -e "${PWD}/${src}" ]
919 then
865 src="${PWD}/${src}" 920 src="${PWD}/${src}"
866 elif [ -e "${src}" ] ; then 921 elif [ -e "${src}" ]
922 then
867 src="${src}" 923 src="${src}"
868 fi 924 fi
869 fi 925 fi
870 [ ! -e "${src}" ] && die "Could not find requested makeself archive ${src}" 926 [ ! -e "${src}" ] && die "Could not find requested makeself archive ${src}"
871 927
872 local shrtsrc=`basename ${src}` 928 local shrtsrc="`basename ${src}`"
873 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 929 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
874 if [ -z "${skip}" ] ; then 930 if [ -z "${skip}" ]
931 then
875 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 932 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
876 local skip=0 933 local skip=0
877 case ${ver} in 934 case ${ver} in
878 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
879 skip=`grep -a ^skip= ${src} | cut -d= -f2` 936 skip=`grep -a ^skip= ${src} | cut -d= -f2`
907 # 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
908 # 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
909 tail -n +${skip} ${src} | gzip -cd | tar -x --no-same-owner -f - 2>/dev/null 966 tail -n +${skip} ${src} | gzip -cd | tar -x --no-same-owner -f - 2>/dev/null
910 local pipestatus="${PIPESTATUS[*]}" 967 local pipestatus="${PIPESTATUS[*]}"
911 pipestatus="${pipestatus// }" 968 pipestatus="${pipestatus// }"
912 if [ "${pipestatus//0}" != "" ] ; then 969 if [ "${pipestatus//0}" != "" ]
970 then
913 # maybe it isnt gzipped ... they usually are, but not always ... 971 # maybe it isnt gzipped ... they usually are, but not always ...
914 tail -n +${skip} ${src} | tar -x --no-same-owner -f - \ 972 tail -n +${skip} ${src} | tar -x --no-same-owner -f - \
915 || die "failure unpacking makeself ${shrtsrc} ('${ver}' +${skip})" 973 || die "failure unpacking makeself ${shrtsrc} ('${ver}' +${skip})"
916 fi 974 fi
917} 975}
919# Display a license for user to accept. 977# Display a license for user to accept.
920# 978#
921# Usage: check_license [license] 979# Usage: check_license [license]
922# - If the file is not specified then ${LICENSE} is used. 980# - If the file is not specified then ${LICENSE} is used.
923check_license() { 981check_license() {
924 local src=$1 982 local lic=$1
925 if [ -z "${src}" ] ; then 983 if [ -z "${lic}" ] ; then
926 src="${PORTDIR}/licenses/${LICENSE}" 984 lic="${PORTDIR}/licenses/${LICENSE}"
927 else 985 else
928 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 986 if [ -e "${PORTDIR}/licenses/${src}" ] ; then
929 src="${PORTDIR}/licenses/${src}" 987 lic="${PORTDIR}/licenses/${src}"
930 elif [ -e "${PWD}/${src}" ] ; then 988 elif [ -e "${PWD}/${src}" ] ; then
931 src="${PWD}/${src}" 989 lic="${PWD}/${src}"
932 elif [ -e "${src}" ] ; then 990 elif [ -e "${src}" ] ; then
933 src="${src}" 991 lic="${src}"
934 fi
935 fi 992 fi
993 fi
936 [ ! -e "${src}" ] && die "Could not find requested license ${src}" 994 [ ! -f "${lic}" ] && die "Could not find requested license ${src}"
937 995
938 # here is where we check for the license... 996 # here is where we check for the licenses the user already
939 # if we don't find one, we ask the user for it 997 # accepted ... if we don't find a match, we make the user accept
940 if [ -f /usr/share/licenses/${LICENSE} ]; then 998 local alic
941 einfo "The license for this application has already been accepted." 999 for alic in ${ACCEPT_LICENSE} ; do
942 else 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
943 ewarn "You MUST accept this license for installation to continue." 1008package. You MUST accept this license for installation to
1009continue. When you are done viewing, hit 'q'. If you
944 eerror "If you CTRL+C out of this, the install will not run!" 1010CTRL+C out of this, the install will not run!
945 echo 1011**********************************************************
946 1012
947 ${PAGER} ${src} || die "Could not execute ${PAGER} ${src} 1013EOF
1014 cat ${lic} >> ${licmsg}
1015 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}"
948 einfo "Do you accept the terms of this license? [yes/no]" 1016 einfon "Do you accept the terms of this license? [yes/no] "
949 read ACCEPT_TERMS 1017 read alic
950 case ${ACCEPT_TERMS} in 1018 case ${alic} in
951 yes|Yes|y|Y) 1019 yes|Yes|y|Y)
952 cp ${src} /usr/share/licenses 1020 return 0
953 exit 0
954 ;; 1021 ;;
955 *) 1022 *)
1023 echo;echo;echo
956 eerror "You MUST accept the license to continue! Exiting!" 1024 eerror "You MUST accept the license to continue! Exiting!"
957 die "Failed to accept license" 1025 die "Failed to accept license"
958 ;; 1026 ;;
959 esac 1027 esac
960 fi
961} 1028}

Legend:
Removed from v.1.56  
changed lines
  Added in v.1.61

  ViewVC Help
Powered by ViewVC 1.1.20