Attachment #321436 for bug #263565

View | Details | Raw Unified | Return to bug 263565
Collapse All | Expand All

Lines 9-22 if [[ -z ${T} ]] \|\| [[ -z ${2} ]] ; then Link Here

(-)a/bin/ebuild-helpers/newbin (-7 / +29 lines)
9	exit 1	9	exit 1
10	fi	10	fi
11		11
12	if [ ! -e "$1" ] ; then
13	helpers_die "!!! ${0##*/}: $1 does not exist"
14	exit 1
15	fi
16
17	(($#>2)) && \	12	(($#>2)) && \
18	eqawarn "QA Notice: ${0##*/} called with more than 2 arguments: ${@:3}"	13	eqawarn "QA Notice: ${0##*/} called with more than 2 arguments: ${@:3}"
19		14
20	rm -rf "${T}/${2}" && \	15	stdin=
21	cp -f "${1}" "${T}/${2}" && \	16	case ${EAPI} in
		17	0\|1\|2\|3\|4) ;;
		18	*) [[ $1 = "-" ]] && stdin=yes ;;
		19	esac
		20
		21	rm -rf "${T}/$2"
		22
		23	if [[ ${stdin} ]] ; then
		24	if [[ -t 0 ]] ; then
		25	helpers_die "!!! ${0##*/}: Input is from a terminal"
		26	exit 1
		27	fi
		28	cat > "${T}/$2"
		29	ret=$?
		30	else
		31	if [[ ! -e $1 ]] ; then
		32	helpers_die "!!! ${0##*/}: $1 does not exist"
		33	exit 1
		34	fi
		35	cp -f "$1" "${T}/$2"
		36	ret=$?
		37	fi
		38
		39	if [[ ${ret} -ne 0 ]] ; then
		40	helpers_die "${0##*/} failed"
		41	exit ${ret}
		42	fi
		43
22	exec dobin "${T}/${2}"	44	exec dobin "${T}/${2}"

Lines 9-22 if [[ -z ${T} ]] \|\| [[ -z ${2} ]] ; then Link Here

(-)a/bin/ebuild-helpers/newconfd (-7 / +29 lines)
9	exit 1	9	exit 1
10	fi	10	fi
11		11
12	if [ ! -e "$1" ] ; then
13	helpers_die "!!! ${0##*/}: $1 does not exist"
14	exit 1
15	fi
16
17	(($#>2)) && \	12	(($#>2)) && \
18	eqawarn "QA Notice: ${0##*/} called with more than 2 arguments: ${@:3}"	13	eqawarn "QA Notice: ${0##*/} called with more than 2 arguments: ${@:3}"
19		14
20	rm -rf "${T}/${2}" && \	15	stdin=
21	cp -f "${1}" "${T}/${2}" && \	16	case ${EAPI} in
		17	0\|1\|2\|3\|4) ;;
		18	*) [[ $1 = "-" ]] && stdin=yes ;;
		19	esac
		20
		21	rm -rf "${T}/$2"
		22
		23	if [[ ${stdin} ]] ; then
		24	if [[ -t 0 ]] ; then
		25	helpers_die "!!! ${0##*/}: Input is from a terminal"
		26	exit 1
		27	fi
		28	cat > "${T}/$2"
		29	ret=$?
		30	else
		31	if [[ ! -e $1 ]] ; then
		32	helpers_die "!!! ${0##*/}: $1 does not exist"
		33	exit 1
		34	fi
		35	cp -f "$1" "${T}/$2"
		36	ret=$?
		37	fi
		38
		39	if [[ ${ret} -ne 0 ]] ; then
		40	helpers_die "${0##*/} failed"
		41	exit ${ret}
		42	fi
		43
22	exec doconfd "${T}/${2}"	44	exec doconfd "${T}/${2}"

Lines 9-22 if [[ -z ${T} ]] \|\| [[ -z ${2} ]] ; then Link Here

(-)a/bin/ebuild-helpers/newdoc (-7 / +29 lines)
9	exit 1	9	exit 1
10	fi	10	fi
11		11
12	if [ ! -e "$1" ] ; then
13	helpers_die "!!! ${0##*/}: $1 does not exist"
14	exit 1
15	fi
16
17	(($#>2)) && \	12	(($#>2)) && \
18	eqawarn "QA Notice: ${0##*/} called with more than 2 arguments: ${@:3}"	13	eqawarn "QA Notice: ${0##*/} called with more than 2 arguments: ${@:3}"
19		14
20	rm -rf "${T}/${2}" && \	15	stdin=
21	cp -f "${1}" "${T}/${2}" && \	16	case ${EAPI} in
		17	0\|1\|2\|3\|4) ;;
		18	*) [[ $1 = "-" ]] && stdin=yes ;;
		19	esac
		20
		21	rm -rf "${T}/$2"
		22
		23	if [[ ${stdin} ]] ; then
		24	if [[ -t 0 ]] ; then
		25	helpers_die "!!! ${0##*/}: Input is from a terminal"
		26	exit 1
		27	fi
		28	cat > "${T}/$2"
		29	ret=$?
		30	else
		31	if [[ ! -e $1 ]] ; then
		32	helpers_die "!!! ${0##*/}: $1 does not exist"
		33	exit 1
		34	fi
		35	cp -f "$1" "${T}/$2"
		36	ret=$?
		37	fi
		38
		39	if [[ ${ret} -ne 0 ]] ; then
		40	helpers_die "${0##*/} failed"
		41	exit ${ret}
		42	fi
		43
22	exec dodoc "${T}/${2}"	44	exec dodoc "${T}/${2}"

Lines 9-22 if [[ -z ${T} ]] \|\| [[ -z ${2} ]] ; then Link Here

(-)a/bin/ebuild-helpers/newenvd (-7 / +29 lines)
9	exit 1	9	exit 1
10	fi	10	fi
11		11
12	if [ ! -e "$1" ] ; then
13	helpers_die "!!! ${0##*/}: $1 does not exist"
14	exit 1
15	fi
16
17	(($#>2)) && \	12	(($#>2)) && \
18	eqawarn "QA Notice: ${0##*/} called with more than 2 arguments: ${@:3}"	13	eqawarn "QA Notice: ${0##*/} called with more than 2 arguments: ${@:3}"
19		14
20	rm -rf "${T}/${2}" && \	15	stdin=
21	cp -f "${1}" "${T}/${2}" && \	16	case ${EAPI} in
		17	0\|1\|2\|3\|4) ;;
		18	*) [[ $1 = "-" ]] && stdin=yes ;;
		19	esac
		20
		21	rm -rf "${T}/$2"
		22
		23	if [[ ${stdin} ]] ; then
		24	if [[ -t 0 ]] ; then
		25	helpers_die "!!! ${0##*/}: Input is from a terminal"
		26	exit 1
		27	fi
		28	cat > "${T}/$2"
		29	ret=$?
		30	else
		31	if [[ ! -e $1 ]] ; then
		32	helpers_die "!!! ${0##*/}: $1 does not exist"
		33	exit 1
		34	fi
		35	cp -f "$1" "${T}/$2"
		36	ret=$?
		37	fi
		38
		39	if [[ ${ret} -ne 0 ]] ; then
		40	helpers_die "${0##*/} failed"
		41	exit ${ret}
		42	fi
		43
22	exec doenvd "${T}/${2}"	44	exec doenvd "${T}/${2}"

Lines 9-22 if [[ -z ${T} ]] \|\| [[ -z ${2} ]] ; then Link Here

(-)a/bin/ebuild-helpers/newexe (-7 / +29 lines)
9	exit 1	9	exit 1
10	fi	10	fi
11		11
12	if [ ! -e "$1" ] ; then
13	helpers_die "!!! ${0##*/}: $1 does not exist"
14	exit 1
15	fi
16
17	(($#>2)) && \	12	(($#>2)) && \
18	eqawarn "QA Notice: ${0##*/} called with more than 2 arguments: ${@:3}"	13	eqawarn "QA Notice: ${0##*/} called with more than 2 arguments: ${@:3}"
19		14
20	rm -rf "${T}/${2}" && \	15	stdin=
21	cp -f "${1}" "${T}/${2}" && \	16	case ${EAPI} in
		17	0\|1\|2\|3\|4) ;;
		18	*) [[ $1 = "-" ]] && stdin=yes ;;
		19	esac
		20
		21	rm -rf "${T}/$2"
		22
		23	if [[ ${stdin} ]] ; then
		24	if [[ -t 0 ]] ; then
		25	helpers_die "!!! ${0##*/}: Input is from a terminal"
		26	exit 1
		27	fi
		28	cat > "${T}/$2"
		29	ret=$?
		30	else
		31	if [[ ! -e $1 ]] ; then
		32	helpers_die "!!! ${0##*/}: $1 does not exist"
		33	exit 1
		34	fi
		35	cp -f "$1" "${T}/$2"
		36	ret=$?
		37	fi
		38
		39	if [[ ${ret} -ne 0 ]] ; then
		40	helpers_die "${0##*/} failed"
		41	exit ${ret}
		42	fi
		43
22	exec doexe "${T}/${2}"	44	exec doexe "${T}/${2}"

Lines 9-22 if [[ -z ${T} ]] \|\| [[ -z ${2} ]] ; then Link Here

(-)a/bin/ebuild-helpers/newinitd (-7 / +29 lines)
9	exit 1	9	exit 1
10	fi	10	fi
11		11
12	if [ ! -e "$1" ] ; then
13	helpers_die "!!! ${0##*/}: $1 does not exist"
14	exit 1
15	fi
16
17	(($#>2)) && \	12	(($#>2)) && \
18	eqawarn "QA Notice: ${0##*/} called with more than 2 arguments: ${@:3}"	13	eqawarn "QA Notice: ${0##*/} called with more than 2 arguments: ${@:3}"
19		14
20	rm -rf "${T}/${2}" && \	15	stdin=
21	cp -f "${1}" "${T}/${2}" && \	16	case ${EAPI} in
		17	0\|1\|2\|3\|4) ;;
		18	*) [[ $1 = "-" ]] && stdin=yes ;;
		19	esac
		20
		21	rm -rf "${T}/$2"
		22
		23	if [[ ${stdin} ]] ; then
		24	if [[ -t 0 ]] ; then
		25	helpers_die "!!! ${0##*/}: Input is from a terminal"
		26	exit 1
		27	fi
		28	cat > "${T}/$2"
		29	ret=$?
		30	else
		31	if [[ ! -e $1 ]] ; then
		32	helpers_die "!!! ${0##*/}: $1 does not exist"
		33	exit 1
		34	fi
		35	cp -f "$1" "${T}/$2"
		36	ret=$?
		37	fi
		38
		39	if [[ ${ret} -ne 0 ]] ; then
		40	helpers_die "${0##*/} failed"
		41	exit ${ret}
		42	fi
		43
22	exec doinitd "${T}/${2}"	44	exec doinitd "${T}/${2}"

Lines 9-36 if [[ -z ${T} ]] \|\| [[ -z ${2} ]] ; then Link Here

(-)a/bin/ebuild-helpers/newins (-18 / +36 lines)
9	exit 1	9	exit 1
10	fi	10	fi
11		11
12	if [ ! -e "$1" ] ; then
13	helpers_die "!!! ${0##*/}: $1 does not exist"
14	exit 1
15	fi
16
17	(($#>2)) && \	12	(($#>2)) && \
18	eqawarn "QA Notice: ${0##*/} called with more than 2 arguments: ${@:3}"	13	eqawarn "QA Notice: ${0##*/} called with more than 2 arguments: ${@:3}"
19		14
20	rm -rf "${T}/${2}" \|\| exit $?	15	stdin=
21	case "$EAPI" in	16	case ${EAPI} in
22	0\|1\|2\|3)	17	0\|1\|2\|3\|4) ;;
23	cp "$1" "$T/$2" \|\| exit $?	18	*) [[ $1 = "-" ]] && stdin=yes ;;
24	;;
25	*)
26	cp -P "$1" "$T/$2"
27	ret=$?
28	if [[ $ret -ne 0 ]] ; then
29	helpers_die "${0##*/} failed"
30	exit $ret
31	fi
32	;;
33	esac	19	esac
		20
		21	rm -rf "${T}/$2"
		22
		23	if [[ ${stdin} ]] ; then
		24	if [[ -t 0 ]] ; then
		25	helpers_die "!!! ${0##*/}: Input is from a terminal"
		26	exit 1
		27	fi
		28	cat > "${T}/$2"
		29	ret=$?
		30	else
		31	if [[ ! -e $1 ]] ; then
		32	helpers_die "!!! ${0##*/}: $1 does not exist"
		33	exit 1
		34	fi
		35	case "$EAPI" in
		36	0\|1\|2\|3)
		37	cp "$1" "${T}/$2"
		38	ret=$?
		39	;;
		40	*)
		41	cp -P "$1" "${T}/$2"
		42	ret=$?
		43	;;
		44	esac
		45	fi
		46
		47	if [[ ${ret} -ne 0 ]] ; then
		48	helpers_die "${0##*/} failed"
		49	exit ${ret}
		50	fi
		51
34	doins "${T}/${2}"	52	doins "${T}/${2}"
35	ret=$?	53	ret=$?
36	rm -rf "${T}/${2}"	54	rm -rf "${T}/${2}"

Lines 9-22 if [[ -z ${T} ]] \|\| [[ -z ${2} ]] ; then Link Here

(-)a/bin/ebuild-helpers/newlib.a (-7 / +29 lines)
9	exit 1	9	exit 1
10	fi	10	fi
11		11
12	if [ ! -e "$1" ] ; then
13	helpers_die "!!! ${0##*/}: $1 does not exist"
14	exit 1
15	fi
16
17	(($#>2)) && \	12	(($#>2)) && \
18	eqawarn "QA Notice: ${0##*/} called with more than 2 arguments: ${@:3}"	13	eqawarn "QA Notice: ${0##*/} called with more than 2 arguments: ${@:3}"
19		14
20	rm -rf "${T}/${2}" && \	15	stdin=
21	cp -f "${1}" "${T}/${2}" && \	16	case ${EAPI} in
		17	0\|1\|2\|3\|4) ;;
		18	*) [[ $1 = "-" ]] && stdin=yes ;;
		19	esac
		20
		21	rm -rf "${T}/$2"
		22
		23	if [[ ${stdin} ]] ; then
		24	if [[ -t 0 ]] ; then
		25	helpers_die "!!! ${0##*/}: Input is from a terminal"
		26	exit 1
		27	fi
		28	cat > "${T}/$2"
		29	ret=$?
		30	else
		31	if [[ ! -e $1 ]] ; then
		32	helpers_die "!!! ${0##*/}: $1 does not exist"
		33	exit 1
		34	fi
		35	cp -f "$1" "${T}/$2"
		36	ret=$?
		37	fi
		38
		39	if [[ ${ret} -ne 0 ]] ; then
		40	helpers_die "${0##*/} failed"
		41	exit ${ret}
		42	fi
		43
22	exec dolib.a "${T}/${2}"	44	exec dolib.a "${T}/${2}"

Lines 9-22 if [[ -z ${T} ]] \|\| [[ -z ${2} ]] ; then Link Here

(-)a/bin/ebuild-helpers/newlib.so (-7 / +29 lines)
9	exit 1	9	exit 1
10	fi	10	fi
11		11
12	if [ ! -e "$1" ] ; then
13	helpers_die "!!! ${0##*/}: $1 does not exist"
14	exit 1
15	fi
16
17	(($#>2)) && \	12	(($#>2)) && \
18	eqawarn "QA Notice: ${0##*/} called with more than 2 arguments: ${@:3}"	13	eqawarn "QA Notice: ${0##*/} called with more than 2 arguments: ${@:3}"
19		14
20	rm -rf "${T}/${2}" && \	15	stdin=
21	cp -f "${1}" "${T}/${2}" && \	16	case ${EAPI} in
		17	0\|1\|2\|3\|4) ;;
		18	*) [[ $1 = "-" ]] && stdin=yes ;;
		19	esac
		20
		21	rm -rf "${T}/$2"
		22
		23	if [[ ${stdin} ]] ; then
		24	if [[ -t 0 ]] ; then
		25	helpers_die "!!! ${0##*/}: Input is from a terminal"
		26	exit 1
		27	fi
		28	cat > "${T}/$2"
		29	ret=$?
		30	else
		31	if [[ ! -e $1 ]] ; then
		32	helpers_die "!!! ${0##*/}: $1 does not exist"
		33	exit 1
		34	fi
		35	cp -f "$1" "${T}/$2"
		36	ret=$?
		37	fi
		38
		39	if [[ ${ret} -ne 0 ]] ; then
		40	helpers_die "${0##*/} failed"
		41	exit ${ret}
		42	fi
		43
22	exec dolib.so "${T}/${2}"	44	exec dolib.so "${T}/${2}"

Lines 9-22 if [[ -z ${T} ]] \|\| [[ -z ${2} ]] ; then Link Here

(-)a/bin/ebuild-helpers/newman (-7 / +29 lines)
9	exit 1	9	exit 1
10	fi	10	fi
11		11
12	if [ ! -e "$1" ] ; then
13	helpers_die "!!! ${0##*/}: $1 does not exist"
14	exit 1
15	fi
16
17	(($#>2)) && \	12	(($#>2)) && \
18	eqawarn "QA Notice: ${0##*/} called with more than 2 arguments: ${@:3}"	13	eqawarn "QA Notice: ${0##*/} called with more than 2 arguments: ${@:3}"
19		14
20	rm -rf "${T}/${2}" && \	15	stdin=
21	cp -f "${1}" "${T}/${2}" && \	16	case ${EAPI} in
		17	0\|1\|2\|3\|4) ;;
		18	*) [[ $1 = "-" ]] && stdin=yes ;;
		19	esac
		20
		21	rm -rf "${T}/$2"
		22
		23	if [[ ${stdin} ]] ; then
		24	if [[ -t 0 ]] ; then
		25	helpers_die "!!! ${0##*/}: Input is from a terminal"
		26	exit 1
		27	fi
		28	cat > "${T}/$2"
		29	ret=$?
		30	else
		31	if [[ ! -e $1 ]] ; then
		32	helpers_die "!!! ${0##*/}: $1 does not exist"
		33	exit 1
		34	fi
		35	cp -f "$1" "${T}/$2"
		36	ret=$?
		37	fi
		38
		39	if [[ ${ret} -ne 0 ]] ; then
		40	helpers_die "${0##*/} failed"
		41	exit ${ret}
		42	fi
		43
22	exec doman "${T}/${2}"	44	exec doman "${T}/${2}"

Lines 9-22 if [[ -z ${T} ]] \|\| [[ -z ${2} ]] ; then Link Here

(-)a/bin/ebuild-helpers/newsbin (-8 / +29 lines)
9	exit 1	9	exit 1
10	fi	10	fi
11		11
12	if [ ! -e "$1" ] ; then
13	helpers_die "!!! ${0##*/}: $1 does not exist"
14	exit 1
15	fi
16
17	(($#>2)) && \	12	(($#>2)) && \
18	eqawarn "QA Notice: ${0##*/} called with more than 2 arguments: ${@:3}"	13	eqawarn "QA Notice: ${0##*/} called with more than 2 arguments: ${@:3}"
19		14
20	rm -rf "${T}/${2}" && \	15	stdin=
21	cp -f "${1}" "${T}/${2}" && \	16	case ${EAPI} in
		17	0\|1\|2\|3\|4) ;;
		18	*) [[ $1 = "-" ]] && stdin=yes ;;
		19	esac
		20
		21	rm -rf "${T}/$2"
		22
		23	if [[ ${stdin} ]] ; then
		24	if [[ -t 0 ]] ; then
		25	helpers_die "!!! ${0##*/}: Input is from a terminal"
		26	exit 1
		27	fi
		28	cat > "${T}/$2"
		29	ret=$?
		30	else
		31	if [[ ! -e $1 ]] ; then
		32	helpers_die "!!! ${0##*/}: $1 does not exist"
		33	exit 1
		34	fi
		35	cp -f "$1" "${T}/$2"
		36	ret=$?
		37	fi
		38
		39	if [[ ${ret} -ne 0 ]] ; then
		40	helpers_die "${0##*/} failed"
		41	exit ${ret}
		42	fi
		43
22	exec dosbin "${T}/${2}"	44	exec dosbin "${T}/${2}"
23	-

Return to bug 263565