Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 273636
Collapse All | Expand All

(-)a/bin/ebuild-helpers/doins (-7 / +5 lines)
Lines 1-5 Link Here
1
#!/bin/bash
1
#!/bin/bash
2
# Copyright 1999-2007 Gentoo Foundation
2
# Copyright 1999-2009 Gentoo Foundation
3
# Distributed under the terms of the GNU General Public License v2
3
# Distributed under the terms of the GNU General Public License v2
4
# $Id$
4
# $Id$
5
5
Lines 32-48 mkdir -p "$TMP"/{1,2} Link Here
32
[[ ! -d ${D}${INSDESTTREE} ]] && dodir "${INSDESTTREE}"
32
[[ ! -d ${D}${INSDESTTREE} ]] && dodir "${INSDESTTREE}"
33
33
34
_doins() {
34
_doins() {
35
	local mysrc="$1" mydir="$2" cleanup="" rval
35
	local mysrc="$1" mydir="$2" rval
36
36
37
	if [ -L "$mysrc" ] ; then
37
	if [ -L "$mysrc" ] ; then
38
		cp "$mysrc" "$TMP/2"
38
		ln -snf "$(readlink "${mysrc}")" "${D}${INSDESTTREE}/${mydir}/${mysrc##*/}"
39
		mysrc="$TMP/2/${mysrc##*/}"
39
		return $?
40
		cleanup=${mysrc}
41
	fi
40
	fi
42
41
43
	install ${INSOPTIONS} "${mysrc}" "${D}${INSDESTTREE}/${mydir}"
42
	install ${INSOPTIONS} "${mysrc}" "${D}${INSDESTTREE}/${mydir}"
44
	rval=$?
43
	rval=$?
45
	[[ -n ${cleanup} ]] && rm -f "${cleanup}"
46
	[ $rval -ne 0 ] && echo "!!! ${0##*/}: $mysrc does not exist" 1>&2
44
	[ $rval -ne 0 ] && echo "!!! ${0##*/}: $mysrc does not exist" 1>&2
47
	return $rval
45
	return $rval
48
}
46
}
Lines 56-62 _xdoins() { Link Here
56
success=0
54
success=0
57
55
58
for x in "$@" ; do
56
for x in "$@" ; do
59
	if [ -d "$x" ] ; then
57
	if [ -d "$x" ] && ! [ -L "$x" ]; then
60
		if [ "${DOINSRECUR}" == "n" ] ; then
58
		if [ "${DOINSRECUR}" == "n" ] ; then
61
			continue
59
			continue
62
		fi
60
		fi
(-)a/bin/ebuild-helpers/newins (-3 / +2 lines)
Lines 1-5 Link Here
1
#!/bin/bash
1
#!/bin/bash
2
# Copyright 1999-2006 Gentoo Foundation
2
# Copyright 1999-2009 Gentoo Foundation
3
# Distributed under the terms of the GNU General Public License v2
3
# Distributed under the terms of the GNU General Public License v2
4
# $Id$
4
# $Id$
5
5
Lines 14-20 if [ ! -e "$1" ] ; then Link Here
14
fi
14
fi
15
15
16
rm -rf "${T}/${2}" || exit $?
16
rm -rf "${T}/${2}" || exit $?
17
cp -f "${1}" "${T}/${2}" || exit $?
17
cp -Pf "${1}" "${T}/${2}" || exit $?
18
doins "${T}/${2}"
18
doins "${T}/${2}"
19
ret=$?
19
ret=$?
20
rm -rf "${T}/${2}"
20
rm -rf "${T}/${2}"
21
- 

Return to bug 273636