diff options
Diffstat (limited to 'bin/phase-helpers.sh')
| -rw-r--r-- | bin/phase-helpers.sh | 64 |
1 files changed, 29 insertions, 35 deletions
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index 27b486f5f..be8919c9f 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -19,10 +19,9 @@ into() { export DESTTREE="" else export DESTTREE=$1 - local ed=${ED} - case "$EAPI" in 0|1|2) ed=${D} ;; esac - if [ ! -d "${ed}${DESTTREE}" ]; then - install -d "${ed}${DESTTREE}" + case "$EAPI" in 0|1|2) local ED=${D} ;; esac + if [ ! -d "${ED}${DESTTREE}" ]; then + install -d "${ED}${DESTTREE}" local ret=$? if [[ $ret -ne 0 ]] ; then helpers_die "${FUNCNAME[0]} failed" @@ -37,10 +36,9 @@ insinto() { export INSDESTTREE="" else export INSDESTTREE=$1 - local ed=${ED} - case "$EAPI" in 0|1|2) ed=${D} ;; esac - if [ ! -d "${ed}${INSDESTTREE}" ]; then - install -d "${ed}${INSDESTTREE}" + case "$EAPI" in 0|1|2) local ED=${D} ;; esac + if [ ! -d "${ED}${INSDESTTREE}" ]; then + install -d "${ED}${INSDESTTREE}" local ret=$? if [[ $ret -ne 0 ]] ; then helpers_die "${FUNCNAME[0]} failed" @@ -55,10 +53,9 @@ exeinto() { export _E_EXEDESTTREE_="" else export _E_EXEDESTTREE_="$1" - local ed=${ED} - case "$EAPI" in 0|1|2) ed=${D} ;; esac - if [ ! -d "${ed}${_E_EXEDESTTREE_}" ]; then - install -d "${ed}${_E_EXEDESTTREE_}" + case "$EAPI" in 0|1|2) local ED=${D} ;; esac + if [ ! -d "${ED}${_E_EXEDESTTREE_}" ]; then + install -d "${ED}${_E_EXEDESTTREE_}" local ret=$? if [[ $ret -ne 0 ]] ; then helpers_die "${FUNCNAME[0]} failed" @@ -73,10 +70,9 @@ docinto() { export _E_DOCDESTTREE_="" else export _E_DOCDESTTREE_="$1" - local ed=${ED} - case "$EAPI" in 0|1|2) ed=${D} ;; esac - if [ ! -d "${ed}usr/share/doc/${PF}/${_E_DOCDESTTREE_}" ]; then - install -d "${ed}usr/share/doc/${PF}/${_E_DOCDESTTREE_}" + case "$EAPI" in 0|1|2) local ED=${D} ;; esac + if [ ! -d "${ED}usr/share/doc/${PF}/${_E_DOCDESTTREE_}" ]; then + install -d "${ED}usr/share/doc/${PF}/${_E_DOCDESTTREE_}" local ret=$? if [[ $ret -ne 0 ]] ; then helpers_die "${FUNCNAME[0]} failed" @@ -141,11 +137,10 @@ docompress() { keepdir() { dodir "$@" local x - local ed=${ED} - case "$EAPI" in 0|1|2) ed=${D} ;; esac + case "$EAPI" in 0|1|2) local ED=${D} ;; esac if [ "$1" == "-R" ] || [ "$1" == "-r" ]; then shift - find "$@" -type d -printf "${ed}%p/.keep_${CATEGORY}_${PN}-${SLOT}\n" \ + find "$@" -type d -printf "${ED}%p/.keep_${CATEGORY}_${PN}-${SLOT}\n" \ | tr "\n" "\0" | \ while read -r -d $'\0' ; do >> "$REPLY" || \ @@ -153,8 +148,8 @@ keepdir() { done else for x in "$@"; do - >> "${ed}${x}/.keep_${CATEGORY}_${PN}-${SLOT}" || \ - die "Failed to create .keep in ${ed}${x}" + >> "${ED}${x}/.keep_${CATEGORY}_${PN}-${SLOT}" || \ + die "Failed to create .keep in ${ED}${x}" done fi } @@ -476,8 +471,7 @@ econf() { einstall() { # CONF_PREFIX is only set if they didn't pass in libdir above. local LOCAL_EXTRA_EINSTALL="${EXTRA_EINSTALL}" - local ed=${ED} - case "$EAPI" in 0|1|2) ed=${D} ;; esac + case "$EAPI" in 0|1|2) local ED=${D} ;; esac LIBDIR_VAR="LIBDIR_${ABI}" if [ -n "${ABI}" -a -n "${!LIBDIR_VAR}" ]; then CONF_LIBDIR="${!LIBDIR_VAR}" @@ -492,22 +486,22 @@ einstall() { if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then if [ "${PORTAGE_DEBUG}" == "1" ]; then - ${MAKE:-make} -n prefix="${ed}usr" \ - datadir="${ed}usr/share" \ - infodir="${ed}usr/share/info" \ - localstatedir="${ed}var/lib" \ - mandir="${ed}usr/share/man" \ - sysconfdir="${ed}etc" \ + ${MAKE:-make} -n prefix="${ED}usr" \ + datadir="${ED}usr/share" \ + infodir="${ED}usr/share/info" \ + localstatedir="${ED}var/lib" \ + mandir="${ED}usr/share/man" \ + sysconfdir="${ED}etc" \ ${LOCAL_EXTRA_EINSTALL} \ ${MAKEOPTS} ${EXTRA_EMAKE} -j1 \ "$@" install fi - ${MAKE:-make} prefix="${ed}usr" \ - datadir="${ed}usr/share" \ - infodir="${ed}usr/share/info" \ - localstatedir="${ed}var/lib" \ - mandir="${ed}usr/share/man" \ - sysconfdir="${ed}etc" \ + ${MAKE:-make} prefix="${ED}usr" \ + datadir="${ED}usr/share" \ + infodir="${ED}usr/share/info" \ + localstatedir="${ED}var/lib" \ + mandir="${ED}usr/share/man" \ + sysconfdir="${ED}etc" \ ${LOCAL_EXTRA_EINSTALL} \ ${MAKEOPTS} ${EXTRA_EMAKE} -j1 \ "$@" install || die "einstall failed" |