commit 30f0083221a5969d3619e4ef6bd312ffde6232bd
author Mike Frysinger <vapier@chromium.org> Mon Oct 28 20:27:15 2013 -0400
committer Mike Frysinger <vapier@chromium.org> Thu Oct 31 01:31:37 2013 +0000
tree 4f25a04b922de57f573a2e09e2f646a7da694896
parent 4733df8bd717dbb082fa920627705250892a1fbd

cros_workon_make: simplify common variables

We duplicate a few variables in a bunch of places.  Unify all that near
the top so the resulting code is simpler.

BUG=chromium:311351
TEST=`cros_workon_make --board x86-generic crash-reporter` still works
TEST=`cros_workon_make --board x86-generic --test crash-reporter` still works

Change-Id: I1e9dce0b5c2843e305b30e1c53240197f76ad8f5
Reviewed-on: https://chromium-review.googlesource.com/174676
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

host/cros_workon_make

diff --git a/host/cros_workon_make b/host/cros_workon_make
index fdb1781..26a859e 100755
--- a/host/cros_workon_make
+++ b/host/cros_workon_make
@@ -48,7 +48,6 @@
 unstable_suffix="9999"
 workon_name="${pkg}-${unstable_suffix}"
 pkgfile=
-workpath=
 
 # Find the ebuild file, ensure the caller is workon'ing the package.
 if ! pkgfile=$("${EQUERYCMD}" which "${workon_name}" 2> /dev/null); then
@@ -81,33 +80,35 @@
 workpath=$(\
     echo "${pkgfile}" | \
         awk -F '/' '{ print $(NF-2) "/" $(NF-1) }')-"${unstable_suffix}"
+workpath="/build/${BOARD}/tmp/portage/${workpath}"
+
+# Export vars that the ebuild env needs from us.
+export SANDBOX_WRITE=~/trunk
+export CROS_WORKON_INPLACE=1
+export FEATURES
 
 # Determine if we're going to do tests, set up commands appropriately.
-emerge_features=
 to_do="compile"
 if [ "${FLAGS_test}" = "${FLAGS_TRUE}" ]; then
   to_do="test"
-  emerge_features="test"
-  rm -f "/build/${BOARD}/tmp/portage/${workpath}/.tested"
+  FEATURES+=" test"
+  rm -f "${workpath}/.tested"
 fi
 
-workdir="/build/${BOARD}/tmp/portage/${workpath}/work/${workon_name}"
+workdir="${workpath}/work/${workon_name}"
 if [ ! -h "${workdir}" ]; then
   warn "Cleaning up stale workdir: ${workdir}"
   FLAGS_reconf="${FLAGS_TRUE}"  # To force symlinking in the user's src dir.
 fi
 
 if [ "${FLAGS_install}" = "${FLAGS_TRUE}" ]; then
-  SANDBOX_WRITE=~/trunk CROS_WORKON_INPLACE=1 \
-    FEATURES="${emerge_features} ${FEATURES}" "${EMERGECMD}" --nodeps "${pkg}"
-  exit $?
+  exec "${EMERGECMD}" --nodeps "${pkg}"
 fi
 
 clean=
 if [ "${FLAGS_reconf}" = "${FLAGS_TRUE}" ]; then
   clean="clean"
 else
-  rm -f "/build/${BOARD}/tmp/portage/${workpath}/.compiled"
+  rm -f "${workpath}/.compiled"
 fi
-SANDBOX_WRITE=~/trunk CROS_WORKON_INPLACE=1 \
-  "${EBUILDCMD}" "${pkgfile}" ${clean} "${to_do}"
+exec "${EBUILDCMD}" "${pkgfile}" ${clean} "${to_do}"