aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-04 05:12:33 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-04 05:12:33 +0000
commit67245806f70a81e6fa3ef9e09079c56553d0c895 (patch)
treec10ba43ce18b271c2c17aa5ff0b311700c753097
parent4354c733691f901173ea67f439d0fc3edaa973c1 (diff)
downloadpaludis-67245806f70a81e6fa3ef9e09079c56553d0c895.tar.gz
paludis-67245806f70a81e6fa3ef9e09079c56553d0c895.tar.xz
show commands to stderr rather than stdout to avoid breaking gcc, which parses emake's output.
-rw-r--r--ebuild/build_functions.bash6
-rw-r--r--ebuild/unpack_functions.bash16
2 files changed, 11 insertions, 11 deletions
diff --git a/ebuild/build_functions.bash b/ebuild/build_functions.bash
index 1226486..fd6d501 100644
--- a/ebuild/build_functions.bash
+++ b/ebuild/build_functions.bash
@@ -57,7 +57,7 @@ econf()
cmd="${cmd} $@ ${LOCAL_EXTRA_ECONF}"
- echo "${cmd}"
+ echo "${cmd}" 1>&2
${cmd} || die "econf failed"
else
@@ -67,7 +67,7 @@ econf()
emake()
{
- echo ${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE} "$@"
+ echo ${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE} "$@" 1>&2
${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE} "$@"
}
@@ -81,7 +81,7 @@ einstall()
cmd="${cmd} sysconfdir='${D}/etc'"
cmd="${cmd} localstatedir='${D}/var/lib'"
cmd="${cmd} ${EXTRA_EINSTALL} ${@} install"
- echo "${cmd}"
+ echo "${cmd}" 1>&2
${cmd} || die "einstall failed"
else
die "No Makefile for einstall"
diff --git a/ebuild/unpack_functions.bash b/ebuild/unpack_functions.bash
index 2bdd7d0..37e7315 100644
--- a/ebuild/unpack_functions.bash
+++ b/ebuild/unpack_functions.bash
@@ -40,42 +40,42 @@ unpack_one()
case "${x}" in
*.tar)
- echo tar xf "${1}"
+ echo tar xf "${1}" 1>&2
tar xf "${1}" || die "Couldn't unpack ${1}"
;;
*.tar.gz|*.tgz)
- echo tar zxf "${1}"
+ echo tar zxf "${1}" 1>&2
tar zxf "${1}" || die "Couldn't unpack ${1}"
;;
*.tar.bz2|*.tbz2)
- echo tar jxf "${1}"
+ echo tar jxf "${1}" 1>&2
tar jxf "${1}" || die "Couldn't unpack ${1}"
;;
*.zip|*.ZIP|*.jar)
- echo unzip -qo "${1}"
+ echo unzip -qo "${1}" 1>&2
unzip -qo "${1}" || die "Couldn't unpack ${1}"
;;
*.gz|*.Z|*.z)
- echo gzip -dc "${1}" > ${WORKDIR}/$(basename "${1%.*}" )
+ echo gzip -dc "${1}" > ${WORKDIR}/$(basename "${1%.*}" ) 1>&2
gzip -dc "${1}" > ${WORKDIR}/$(basename "${1%.*}" ) || die "Couldn't unpack ${1}"
;;
*.bz2)
- echo bzip2 -dc "${1}" > ${WORKDIR}/$(basename "${1%.*}" )
+ echo bzip2 -dc "${1}" > ${WORKDIR}/$(basename "${1%.*}" ) 1>&2
bzip2 -dc "${1}" > ${WORKDIR}/$(basename "${1%.*}" ) || die "Couldn't unpack ${1}"
;;
*.rar|*.RAR)
- echo unrar x -idq "${1}"
+ echo unrar x -idq "${1}" 1>&2
unrar x -idq "${1}" || die "Couldn't unpack ${1}"
;;
*.LHa|*.LHA|*.lha|*.lzh)
- echo lha xqf "${1}"
+ echo lha xqf "${1}" 1>&2
lha xqf "${1}" || die "Couldn't unpack ${1}"
;;