From: Zac Medico Date: Fri, 25 Feb 2011 20:11:34 +0000 (-0800) Subject: doins: avoid die when called as dodoc with no arg X-Git-Tag: v2.1.9.42~15 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9c38ee773137964eb05abbf4f32bc7f5b7352d95;p=portage.git doins: avoid die when called as dodoc with no arg --- diff --git a/bin/ebuild-helpers/doins b/bin/ebuild-helpers/doins index 8055a37a7..c549791fc 100755 --- a/bin/ebuild-helpers/doins +++ b/bin/ebuild-helpers/doins @@ -4,6 +4,17 @@ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh +if [[ ${0##*/} == dodoc ]] ; then + if [ $# -eq 0 ] ; then + # default_src_install may call dodoc with no arguments + # when DOC is defined but empty, so simply return + # sucessfully in this case. + exit 0 + fi + export INSOPTIONS=-m0644 + export INSDESTTREE=usr/share/doc/${PF}/${_E_DOCDESTTREE_} +fi + if [ $# -lt 1 ] ; then helpers_die "${0##*/}: at least one argument needed" exit 1 @@ -16,17 +27,6 @@ else DOINSRECUR=n fi -if [[ ${0##*/} == dodoc ]] ; then - if [ $# -eq 0 ] ; then - # default_src_install may call dodoc with no arguments - # when DOC is defined but empty, so simply return - # sucessfully in this case. - exit 0 - fi - export INSOPTIONS=-m0644 - export INSDESTTREE=usr/share/doc/${PF}/${_E_DOCDESTTREE_} -fi - if [[ ${INSDESTTREE#${D}} != "${INSDESTTREE}" ]]; then vecho "-------------------------------------------------------" 1>&2 vecho "You should not use \${D} with helpers." 1>&2