Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 121317 | Differences between
and this patch

Collapse All | Expand All

(-)dodoc (-3 / +3 lines)
Lines 9-22 Link Here
9
9
10
dir="${D}usr/share/doc/${PF}/${DOCDESTTREE}"
10
dir="${D}usr/share/doc/${PF}/${DOCDESTTREE}"
11
if [ ! -d "${dir}" ] ; then
11
if [ ! -d "${dir}" ] ; then
12
	install -d "${dir}"
12
	install -d "${dir}" || exit 2
13
fi
13
fi
14
14
15
ret=0
15
ret=0
16
for x in "$@" ; do
16
for x in "$@" ; do
17
	if [ -s "${x}" ] ; then
17
	if [ -s "${x}" ] ; then
18
		install -m0644 "${x}" "${dir}"
18
		install -m0644 "${x}" "${dir}" || exit 3
19
		gzip -f -9 "${dir}/${x##*/}"
19
		gzip -f -9 "${dir}/${x##*/}" || exit 4
20
	elif [ ! -e "${x}" ] ; then
20
	elif [ ! -e "${x}" ] ; then
21
		echo "dodoc: ${x} does not exist" 1>&2
21
		echo "dodoc: ${x} does not exist" 1>&2
22
		((++ret))
22
		((++ret))
(-)doman (-3 / +3 lines)
Lines 36-48 Link Here
36
	if echo ${mandir} | egrep -q 'man[0-9n](|f|p|pm)$' -; then
36
	if echo ${mandir} | egrep -q 'man[0-9n](|f|p|pm)$' -; then
37
		if [ -s "${x}" ] ; then
37
		if [ -s "${x}" ] ; then
38
			if [ ! -d "${D}${BASE}/man/${mandir}" ] ; then
38
			if [ ! -d "${D}${BASE}/man/${mandir}" ] ; then
39
				install -d "${D}${BASE}/man/${mandir}"
39
				install -d "${D}${BASE}/man/${mandir}" || exit 2
40
			fi
40
			fi
41
41
42
			install -m0644 "${x}" "${D}${BASE}/man/${mandir}"
42
			install -m0644 "${x}" "${D}${BASE}/man/${mandir}" || exit 3
43
43
44
			if [ -z "${compressed}" ] ; then
44
			if [ -z "${compressed}" ] ; then
45
				gzip -f -9 "${D}${BASE}/man/${mandir}/${x##*/}"
45
				gzip -f -9 "${D}${BASE}/man/${mandir}/${x##*/}" || exit 4
46
			fi
46
			fi
47
		else
47
		else
48
			echo "doman: ${x} does not exist" 1>&2
48
			echo "doman: ${x} does not exist" 1>&2
(-)domo (-3 / +3 lines)
Lines 9-15 Link Here
9
	exit 1
9
	exit 1
10
fi
10
fi
11
if [ ! -d "${D}${DESTTREE}/share/locale" ] ; then
11
if [ ! -d "${D}${DESTTREE}/share/locale" ] ; then
12
	install -d "${D}${DESTTREE}/share/locale/"
12
	install -d "${D}${DESTTREE}/share/locale/" || exit 1
13
fi
13
fi
14
14
15
for x in "$@" ; do
15
for x in "$@" ; do
Lines 17-25 Link Here
17
		mytiny="${x##*/}"
17
		mytiny="${x##*/}"
18
		mydir="${D}${DESTTREE}/share/locale/${mytiny%.*}/LC_MESSAGES"
18
		mydir="${D}${DESTTREE}/share/locale/${mytiny%.*}/LC_MESSAGES"
19
		if [ ! -d "${mydir}" ] ; then
19
		if [ ! -d "${mydir}" ] ; then
20
			install -d "${mydir}"
20
			install -d "${mydir}" || exit 2
21
		fi
21
		fi
22
		install -m0644 "${x}" "${mydir}/${MOPREFIX}.mo"
22
		install -m0644 "${x}" "${mydir}/${MOPREFIX}.mo" || exit 3
23
	else
23
	else
24
		echo "${0}: ${x} does not exist"
24
		echo "${0}: ${x} does not exist"
25
	fi
25
	fi
(-)dosed (-1 / +1 lines)
Lines 11-17 Link Here
11
		if [ -f "${y}" ] ; then
11
		if [ -f "${y}" ] ; then
12
			mysrc="${T}/${y##*/}"
12
			mysrc="${T}/${y##*/}"
13
			cp "${y}" "${mysrc}"
13
			cp "${y}" "${mysrc}"
14
			sed -e "${mysed}" "${mysrc}" > "${y}"
14
			sed -e "${mysed}" "${mysrc}" > "${y}" || exit 2
15
		else
15
		else
16
			echo "${y} is not a regular file!"
16
			echo "${y} is not a regular file!"
17
			exit 1
17
			exit 1
(-)doconfd (-1 / +1 lines)
Lines 10-15 Link Here
10
10
11
tmp_INSDESTTREE="${INSDESTTREE}"
11
tmp_INSDESTTREE="${INSDESTTREE}"
12
INSDESTTREE=/etc/conf.d/
12
INSDESTTREE=/etc/conf.d/
13
doins "$@"
13
doins "$@" || exit 2
14
INSDESTTREE="${tmp_INSDESTTREE}"
14
INSDESTTREE="${tmp_INSDESTTREE}"
15
unset tmp_INSDESTTREE
15
unset tmp_INSDESTTREE
(-)doinfo (-3 / +3 lines)
Lines 8-20 Link Here
8
	exit 1 	
8
	exit 1 	
9
fi
9
fi
10
if [ ! -d "${D}usr/share/info" ] ; then
10
if [ ! -d "${D}usr/share/info" ] ; then
11
	install -d "${D}usr/share/info"
11
	install -d "${D}usr/share/info" || exit 2
12
fi
12
fi
13
13
14
for x in "$@" ; do
14
for x in "$@" ; do
15
	if [ -e "${x}" ] ; then
15
	if [ -e "${x}" ] ; then
16
		install -m0644 "${x}" "${D}usr/share/info"
16
		install -m0644 "${x}" "${D}usr/share/info" || exit 3
17
		gzip -f -9 "${D}usr/share/info/${x##*/}"
17
		gzip -f -9 "${D}usr/share/info/${x##*/}" || exit 4
18
	else
18
	else
19
		echo "doinfo: ${x} does not exist"
19
		echo "doinfo: ${x} does not exist"
20
	fi
20
	fi
(-)doenvd (-1 / +1 lines)
Lines 10-15 Link Here
10
10
11
tmp_INSDESTTREE="${INSDESTTREE}"
11
tmp_INSDESTTREE="${INSDESTTREE}"
12
INSDESTTREE=/etc/env.d/
12
INSDESTTREE=/etc/env.d/
13
doins "$@"
13
doins "$@" || exit 1
14
INSDESTTREE="${tmp_INSDESTTREE}"
14
INSDESTTREE="${tmp_INSDESTTREE}"
15
unset tmp_INSDESTTREE
15
unset tmp_INSDESTTREE
(-)doins (-3 / +5 lines)
Lines 28-34 Link Here
28
	#exit 1
28
	#exit 1
29
fi
29
fi
30
30
31
[ ! -d "${D}${INSDESTTREE}" ] && dodir "${INSDESTTREE}"
31
if [ ! -d "${D}${INSDESTTREE}" ]; then
32
	dodir "${INSDESTTREE}" || exit 2 
33
fi
32
34
33
for x in "$@" ; do
35
for x in "$@" ; do
34
	if [ -L "$x" ] ; then
36
	if [ -L "$x" ] ; then
Lines 44-53 Link Here
44
			env \
46
			env \
45
				INSDESTTREE="${mydir}" \
47
				INSDESTTREE="${mydir}" \
46
				INSDEPTH=$((INSDEPTH+1)) \
48
				INSDEPTH=$((INSDEPTH+1)) \
47
				doins -r {} \;
49
				doins -r {} \; || exit 3
48
		continue
50
		continue
49
	else
51
	else
50
		mysrc="${x}"
52
		mysrc="${x}"
51
	fi
53
	fi
52
	install ${INSOPTIONS} "${mysrc}" "${D}${INSDESTTREE}"
54
	install ${INSOPTIONS} "${mysrc}" "${D}${INSDESTTREE}" || exit 4
53
done
55
done
(-)dolib (-2 / +2 lines)
Lines 25-37 Link Here
25
	exit 1
25
	exit 1
26
fi
26
fi
27
if [ ! -d "${libdir}" ] ; then
27
if [ ! -d "${libdir}" ] ; then
28
	install -d "${libdir}"
28
	install -d "${libdir}" || exit 1
29
fi
29
fi
30
30
31
for x in "$@" ; do
31
for x in "$@" ; do
32
	if [ -e "${x}" ] ; then
32
	if [ -e "${x}" ] ; then
33
		if [ ! -L "${x}" ] ; then
33
		if [ ! -L "${x}" ] ; then
34
			install ${LIBOPTIONS} "${x}" "${libdir}"
34
			install ${LIBOPTIONS} "${x}" "${libdir}" || exit 2
35
		else
35
		else
36
			ln -s "$(readlink "${x}")" "${libdir}/${x}"
36
			ln -s "$(readlink "${x}")" "${libdir}/${x}"
37
		fi
37
		fi
(-)doinitd (-1 / +1 lines)
Lines 10-15 Link Here
10
10
11
tmp_EXEDESTTREE="${EXEDESTTREE}"
11
tmp_EXEDESTTREE="${EXEDESTTREE}"
12
EXEDESTTREE=/etc/init.d/
12
EXEDESTTREE=/etc/init.d/
13
doexe "$@"
13
doexe "$@" || exit 1
14
EXEDESTTREE="${tmp_EXEDESTTREE}"
14
EXEDESTTREE="${tmp_EXEDESTTREE}"
15
unset tmp_EXEDESTTREE
15
unset tmp_EXEDESTTREE
(-)dojar (-2 / +2 lines)
Lines 34-40 Link Here
34
jardest="${DESTTREE}/share/${PN}/${JARDESTTREE}/"
34
jardest="${DESTTREE}/share/${PN}/${JARDESTTREE}/"
35
pf="${D}${jarroot}/package.env"
35
pf="${D}${jarroot}/package.env"
36
36
37
dodir "${jardest}"
37
dodir "${jardest}" || exit 1
38
38
39
for i in $* ; do
39
for i in $* ; do
40
	bn="$(basename $i)"
40
	bn="$(basename $i)"
Lines 50-54 Link Here
50
	fi
50
	fi
51
51
52
	cp "$i" "${D}${jardest}/"
52
	cp "$i" "${D}${jardest}/"
53
	chmod 0444 "${D}${jardest}/${bn}"
53
	chmod 0444 "${D}${jardest}/${bn}" || exit 2
54
done
54
done
(-)dodir (-1 / +1 lines)
Lines 4-8 Link Here
4
# $Id: /var/cvsroot/gentoo-src/portage/bin/dodir,v 1.5 2004/10/04 13:56:50 vapier Exp $
4
# $Id: /var/cvsroot/gentoo-src/portage/bin/dodir,v 1.5 2004/10/04 13:56:50 vapier Exp $
5
5
6
for x in "$@" ; do
6
for x in "$@" ; do
7
	install -d ${DIROPTIONS} "${D}${x}"
7
	install -d ${DIROPTIONS} "${D}${x}" || exit 1
8
done
8
done
(-)doexe (-6 / +5 lines)
Lines 3-26 Link Here
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: /var/cvsroot/gentoo-src/portage/bin/doexe,v 1.10.2.1 2004/12/06 03:01:43 carpaski Exp $
4
# $Id: /var/cvsroot/gentoo-src/portage/bin/doexe,v 1.10.2.1 2004/12/06 03:01:43 carpaski Exp $
5
5
6
mynum=${#}
6
if [ ${#} -lt 1 ] ; then
7
if [ ${mynum} -lt 1 ] ; then
8
	echo "doexe: at least one argument needed"
7
	echo "doexe: at least one argument needed"
9
	exit 1
8
	exit 1
10
fi
9
fi
11
if [ ! -d "${D}${EXEDESTTREE}" ] ; then
10
if [ ! -d "${D}${EXEDESTTREE}" ] ; then
12
	install -d "${D}${EXEDESTTREE}"
11
	install -d "${D}${EXEDESTTREE}" || exit 2
13
fi
12
fi
14
13
15
for x in "$@" ; do
14
for x in "${@}" ; do
16
	if [ -L "${x}" ] ; then
15
	if [ -L "${x}" ] ; then
17
		cp "${x}" "${T}"
16
		cp "${x}" "${T}"
18
		mysrc="${T}"/`/usr/bin/basename "${x}"`
17
		mysrc="${T}"/$(/usr/bin/basename "${x}")
19
	elif [ -d "${x}" ] ; then
18
	elif [ -d "${x}" ] ; then
20
		echo "doexe: warning, skipping directory ${x}"
19
		echo "doexe: warning, skipping directory ${x}"
21
		continue
20
		continue
22
	else
21
	else
23
		mysrc="${x}"
22
		mysrc="${x}"
24
	fi
23
	fi
25
	install ${EXEOPTIONS} "${mysrc}" "${D}${EXEDESTTREE}"
24
	install ${EXEOPTIONS} "${mysrc}" "${D}${EXEDESTTREE}" || exit 3
26
done
25
done

Return to bug 121317