cros_workon: fix forall (broken by --host) :/

cros_workon

 #!/bin/bash
 
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This script moves ebuilds between 'stable' and 'live' states.
 # By default 'stable' ebuilds point at and build from source at the
 # last known good commit. Moving an ebuild to 'live' (via cros_workon start)
 # is intended to support development. The current source tip is fetched,
@@ skipping 32 matching lines @@
 
 
 # board dir config
 [ -n "${FLAGS_board}" ] && [ "${FLAGS_host}" = ${FLAGS_TRUE} ] && \
   die "Flags --host and --board are mutually exclusive."
 [ -z "${FLAGS_board}" ] && [ "${FLAGS_host}" = ${FLAGS_FALSE} ] && \
   die "You must specify either --host or --board="
 
 if [ -n "${FLAGS_board}" ]; then
   BOARD_DIR=/build/"${FLAGS_board}" # --board specified
-  EQUERY=equery-"${FLAGS_board}"
+  EQUERYCMD=equery-"${FLAGS_board}"
+  EBUILDCMD=ebuild-"${FLAGS_board}"
 else
   BOARD_DIR="" # --host specified
-  EQUERY=equery
+  EQUERYCMD=equery
+  EBUILDCMD=ebuild
 fi
 
 KEYWORDS_DIR=${BOARD_DIR}/etc/portage/package.keywords
 UNMASK_DIR=${BOARD_DIR}/etc/portage/package.unmask
 KEYWORDS_FILE=${KEYWORDS_DIR}/cros-workon
 UNMASK_FILE=${UNMASK_DIR}/cros-workon
 
 sudo mkdir -p "${KEYWORDS_DIR}" "${UNMASK_DIR}" || \
   die "mkdir -p ${KEYWORDS_DIR} ${UNMASK_DIR}"
 sudo touch "${KEYWORDS_FILE}" "${UNMASK_FILE}" || \
   die "touch ${KEYWORDS_FILE} ${UNMASK_FILE}"
 
 # Canonicalize package name to category/package.
 canonicalize_name () {
   local pkgfile
   local pkgname
 
-  if ! pkgfile=$(${EQUERY} which $1); then
+  if ! pkgfile=$(${EQUERYCMD} which $1); then
     warn "error looking up package $1" 1>&2
     return 1
   fi
 
   pkgname=$(\
     echo "${pkgfile}" |awk -F '/' '{ print $(NF-2) "/" $(NF-1) }')
 
   if ! grep -q "cros-workon" ${pkgfile}; then
     warn "${pkgname} is not a cros-workon package" 1>&2
     return 1
@@ skipping 55 matching lines @@
     fi
   done
 }
 
 # Run a command on all or a set of repos.
 ebuild_forall() {
   local atoms=$1
 
   for atom in ${atoms}; do
     info "Running \"${FLAGS_command}\" on ${atom}"
-    eval $(ebuild-${FLAGS_board} $(${EQUERY} which ${atom}) info)
+    eval $(${EBUILDCMD} $(${EQUERYCMD} which ${atom}) info)
     (cd "${CROS_WORKON_SRCDIR}" && bash -c "${FLAGS_command}")
   done
 }
 
 show_workon_ebuilds() {
   pushd "${BOARD_DIR}"/etc/ 1> /dev/null
   source make.conf
   popd 1> /dev/null
   local CROS_OVERLAYS="${PORTDIR_OVERLAY}"
 
@@ skipping 32 matching lines @@
   esac
 fi
 
 case ${WORKON_CMD} in
   start)  ebuild_to_live "${ATOM_LIST}" ;;
   stop)   ebuild_to_stable "${ATOM_LIST}" ;;
   list)   [ ${FLAGS_all} = "${FLAGS_FALSE}" ] && show_live_ebuilds || show_workon_ebuilds ;;
   forall) ebuild_forall "${ATOM_LIST}" ;;
   *)      die "invalid cros_workon command" ;;
 esac