Attachment #78796 for bug #121317

Lines 10-15 Link Here

(-)bin/doconfd (-1 / +1 lines)
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

Lines 3-8 Link Here

(-)bin/dodir (-1 / +4 lines)
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/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	ret=0
6	for x in "$@" ; do	7	for x in "$@" ; do
7	install -d ${DIROPTIONS} "${D}${x}"	8	install -d ${DIROPTIONS} "${D}${x}" \|\| ((++ret))
8	done	9	done
		10
		11	exit ${ret}

Lines 9-22 Link Here

(-)bin/dodoc (-3 / +3 lines)
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}" \|\| ((++ret))
19	gzip -f -9 "${dir}/${x##*/}"	19	gzip -f -9 "${dir}/${x##*/}" \|\| ((++ret))
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))

Lines 10-15 Link Here

(-)bin/doenvd (-1 / +1 lines)
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 2
14	INSDESTTREE="${tmp_INSDESTTREE}"	14	INSDESTTREE="${tmp_INSDESTTREE}"
15	unset tmp_INSDESTTREE	15	unset tmp_INSDESTTREE




# Distributed under the terms of the GNU General Public License v2
# $Id: /var/cvsroot/gentoo-src/portage/bin/doexe,v 1.10.2.1 2004/12/06 03:01:43 carpaski Exp $

if [ ${#} -lt 1 ] ; then
if [ ${mynum} -lt 1 ] ; then
	echo "doexe: at least one argument needed"
	exit 1
fi
if [ ! -d "${D}${EXEDESTTREE}" ] ; then
	install -d "${D}${EXEDESTTREE}" || exit 2
fi

ret=0
for x in "${@}" ; do
	if [ -L "${x}" ] ; then
		cp "${x}" "${T}"
		mysrc="${T}"/$(/usr/bin/basename "${x}")
	elif [ -d "${x}" ] ; then
		echo "doexe: warning, skipping directory ${x}"
		continue
	else
		mysrc="${x}"
	fi
	install ${EXEOPTIONS} "${mysrc}" "${D}${EXEDESTTREE}" || ((++ret))
done

exit ${ret}




	exit 1 	
fi
if [ ! -d "${D}usr/share/info" ] ; then
	install -d "${D}usr/share/info" || exit 2
fi

ret=0
for x in "$@" ; do
	if [ -e "${x}" ] ; then
		install -m0644 "${x}" "${D}usr/share/info" || ((++ret))
		gzip -f -9 "${D}usr/share/info/${x##*/}" || ((++ret))
	else
		echo "doinfo: ${x} does not exist"
	fi
done

exit ${ret}

Lines 10-15 Link Here

(-)bin/doinitd (-1 / +1 lines)
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 2
14	EXEDESTTREE="${tmp_EXEDESTTREE}"	14	EXEDESTTREE="${tmp_EXEDESTTREE}"
15	unset tmp_EXEDESTTREE	15	unset tmp_EXEDESTTREE

Lines 28-35 Link Here

(-)bin/doins (-3 / +8 lines)
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
		35	ret=0
33	for x in "$@" ; do	36	for x in "$@" ; do
34	if [ -L "$x" ] ; then	37	if [ -L "$x" ] ; then
35	cp "$x" "${T}"	38	cp "$x" "${T}"
Lines 44-53 Link Here
44	env \	47	env \
45	INSDESTTREE="${mydir}" \	48	INSDESTTREE="${mydir}" \
46	INSDEPTH=$((INSDEPTH+1)) \	49	INSDEPTH=$((INSDEPTH+1)) \
47	doins -r {} \;	50	doins -r {} \; \|\| ((++ret))
48	continue	51	continue
49	else	52	else
50	mysrc="${x}"	53	mysrc="${x}"
51	fi	54	fi
52	install ${INSOPTIONS} "${mysrc}" "${D}${INSDESTTREE}"	55	install ${INSOPTIONS} "${mysrc}" "${D}${INSDESTTREE}" \|\| ((++ret))
53	done	56	done
		57
		58	exit ${ret}

Lines 34-46 Link Here

(-)bin/dojar (-3 / +6 lines)
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	ret=0
39	for i in $* ; do	40	for i in $* ; do
40	bn="$(basename $i)"	41	bn="$(basename $i)"
41		42
42	if [ -f "$pf" ] ; then	43	if [ -f "$pf" ] ; then
43	oldcp=`grep "CLASSPATH=" "$pf" \| sed "s/CLASSPATH=//"`	44	oldcp=$(grep "CLASSPATH=" "$pf" \| sed "s/CLASSPATH=//")
44	grep -v "CLASSPATH=" "$pf" > "${pf}.new"	45	grep -v "CLASSPATH=" "$pf" > "${pf}.new"
45	echo "CLASSPATH=${oldcp}:${jardest}${bn}" >> "${pf}.new"	46	echo "CLASSPATH=${oldcp}:${jardest}${bn}" >> "${pf}.new"
46	mv "${pf}.new" "$pf"	47	mv "${pf}.new" "$pf"
Lines 50-54 Link Here
50	fi	51	fi
51		52
52	cp "$i" "${D}${jardest}/"	53	cp "$i" "${D}${jardest}/"
53	chmod 0444 "${D}${jardest}/${bn}"	54	chmod 0444 "${D}${jardest}/${bn}" \|\| ((++ret))
54	done	55	done
		56
		57	exit ${ret}

Lines 25-41 Link Here

(-)bin/dolib (-3 / +6 lines)
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	ret=0
31	for x in "$@" ; do	32	for x in "$@" ; do
32	if [ -e "${x}" ] ; then	33	if [ -e "${x}" ] ; then
33	if [ ! -L "${x}" ] ; then	34	if [ ! -L "${x}" ] ; then
34	install ${LIBOPTIONS} "${x}" "${libdir}"	35	install ${LIBOPTIONS} "${x}" "${libdir}" \|\| ((++ret))
35	else	36	else
36	ln -s "$(readlink "${x}")" "${libdir}/${x}"	37	ln -s "$(readlink "${x}")" "${libdir}/${x}" \|\| ((++ret))
37	fi	38	fi
38	else	39	else
39	echo "${0}: ${x} does not exist"	40	echo "${0}: ${x} does not exist"
40	fi	41	fi
41	done	42	done
		43
		44	exit ${ret}

Lines 11-16 Link Here

(-)bin/doman (-3 / +6 lines)
11	BASE="/usr/share"	11	BASE="/usr/share"
12	i18n=""	12	i18n=""
13		13
		14	ret=0
14	for x in "$@" ; do	15	for x in "$@" ; do
15	if [ "${x:0:6}" == "-i18n=" ] ; then	16	if [ "${x:0:6}" == "-i18n=" ] ; then
16	i18n="${x:6}/"	17	i18n="${x:6}/"
Lines 36-48 Link Here
36	if echo ${mandir} \| egrep -q 'man[0-9n](\|f\|p\|pm)$' -; then	37	if echo ${mandir} \| egrep -q 'man[0-9n](\|f\|p\|pm)$' -; then
37	if [ -s "${x}" ] ; then	38	if [ -s "${x}" ] ; then
38	if [ ! -d "${D}${BASE}/man/${mandir}" ] ; then	39	if [ ! -d "${D}${BASE}/man/${mandir}" ] ; then
39	install -d "${D}${BASE}/man/${mandir}"	40	install -d "${D}${BASE}/man/${mandir}" \|\| ((++ret))
40	fi	41	fi
41		42
42	install -m0644 "${x}" "${D}${BASE}/man/${mandir}"	43	install -m0644 "${x}" "${D}${BASE}/man/${mandir}" \|\| ((++ret))
43		44
44	if [ -z "${compressed}" ] ; then	45	if [ -z "${compressed}" ] ; then
45	gzip -f -9 "${D}${BASE}/man/${mandir}/${x##*/}"	46	gzip -f -9 "${D}${BASE}/man/${mandir}/${x##*/}" \|\| ((++ret))
46	fi	47	fi
47	else	48	else
48	echo "doman: ${x} does not exist" 1>&2	49	echo "doman: ${x} does not exist" 1>&2
Lines 51-53 Link Here
51	echo "doman: '${x}' is probably not a man page; skipping" 1>&2	52	echo "doman: '${x}' is probably not a man page; skipping" 1>&2
52	fi	53	fi
53	done	54	done
		55
		56	exit ${ret}




	exit 1
fi
if [ ! -d "${D}${DESTTREE}/share/locale" ] ; then
	install -d "${D}${DESTTREE}/share/locale/" || exit 1
fi

ret=0
for x in "$@" ; do
	if [ -e "${x}" ] ; then
		mytiny="${x##*/}"
		mydir="${D}${DESTTREE}/share/locale/${mytiny%.*}/LC_MESSAGES"
		if [ ! -d "${mydir}" ] ; then
			install -d "${mydir}" || ((++ret))
		fi
		install -m0644 "${x}" "${mydir}/${MOPREFIX}.mo" || ((++ret))
	else
		echo "${0}: ${x} does not exist"
	fi
done

exit ${ret}

Lines 5-17 Link Here

(-)bin/dosed (-1 / +4 lines)
5		5
6	mysed="s:${D}::g"	6	mysed="s:${D}::g"
7		7
		8	ret=0
8	for x in "$@" ; do	9	for x in "$@" ; do
9	y="${D}${x}"	10	y="${D}${x}"
10	if [ -a "${y}" ] ; then	11	if [ -a "${y}" ] ; then
11	if [ -f "${y}" ] ; then	12	if [ -f "${y}" ] ; then
12	mysrc="${T}/${y##*/}"	13	mysrc="${T}/${y##*/}"
13	cp "${y}" "${mysrc}"	14	cp "${y}" "${mysrc}"
14	sed -e "${mysed}" "${mysrc}" > "${y}"	15	sed -e "${mysed}" "${mysrc}" > "${y}" \|\| ((++ret))
15	else	16	else
16	echo "${y} is not a regular file!"	17	echo "${y} is not a regular file!"
17	exit 1	18	exit 1
Lines 20-22 Link Here
20	mysed="${x}"	21	mysed="${x}"
21	fi	22	fi
22	done	23	done
		24
		25	exit ${ret}

Return to bug 121317

Lines 3-26 Link Here

(-)bin/doexe (-6 / +8 lines)
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	ret=0
		15	for x in "${@}" ; do
16	if [ -L "${x}" ] ; then	16	if [ -L "${x}" ] ; then
17	cp "${x}" "${T}"	17	cp "${x}" "${T}"
18	mysrc="${T}"/`/usr/bin/basename "${x}"`	18	mysrc="${T}"/$(/usr/bin/basename "${x}")
19	elif [ -d "${x}" ] ; then	19	elif [ -d "${x}" ] ; then
20	echo "doexe: warning, skipping directory ${x}"	20	echo "doexe: warning, skipping directory ${x}"
21	continue	21	continue
22	else	22	else
23	mysrc="${x}"	23	mysrc="${x}"
24	fi	24	fi
25	install ${EXEOPTIONS} "${mysrc}" "${D}${EXEDESTTREE}"	25	install ${EXEOPTIONS} "${mysrc}" "${D}${EXEDESTTREE}" \|\| ((++ret))
26	done	26	done
		27
		28	exit ${ret}

Lines 8-21 Link Here

(-)bin/doinfo (-3 / +6 lines)
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	ret=0
14	for x in "$@" ; do	15	for x in "$@" ; do
15	if [ -e "${x}" ] ; then	16	if [ -e "${x}" ] ; then
16	install -m0644 "${x}" "${D}usr/share/info"	17	install -m0644 "${x}" "${D}usr/share/info" \|\| ((++ret))
17	gzip -f -9 "${D}usr/share/info/${x##*/}"	18	gzip -f -9 "${D}usr/share/info/${x##*/}" \|\| ((++ret))
18	else	19	else
19	echo "doinfo: ${x} does not exist"	20	echo "doinfo: ${x} does not exist"
20	fi	21	fi
21	done	22	done
		23
		24	exit ${ret}

Lines 9-26 Link Here

(-)bin/domo (-3 / +6 lines)
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	ret=0
15	for x in "$@" ; do	16	for x in "$@" ; do
16	if [ -e "${x}" ] ; then	17	if [ -e "${x}" ] ; then
17	mytiny="${x##*/}"	18	mytiny="${x##*/}"
18	mydir="${D}${DESTTREE}/share/locale/${mytiny%.*}/LC_MESSAGES"	19	mydir="${D}${DESTTREE}/share/locale/${mytiny%.*}/LC_MESSAGES"
19	if [ ! -d "${mydir}" ] ; then	20	if [ ! -d "${mydir}" ] ; then
20	install -d "${mydir}"	21	install -d "${mydir}" \|\| ((++ret))
21	fi	22	fi
22	install -m0644 "${x}" "${mydir}/${MOPREFIX}.mo"	23	install -m0644 "${x}" "${mydir}/${MOPREFIX}.mo" \|\| ((++ret))
23	else	24	else
24	echo "${0}: ${x} does not exist"	25	echo "${0}: ${x} does not exist"
25	fi	26	fi
26	done	27	done
		28
		29	exit ${ret}