Update chroot for chromite if needed.

common.sh

 # 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.
 
 # Common constants for build scripts
 # This must evaluate properly for both /bin/bash and /bin/sh
 
 # All scripts should die on error unless commands are specifically excepted
 # by prefixing with '!' or surrounded by 'set +e' / 'set -e'.
 # TODO: Re-enable this once shflags is less prone to dying.
@@ skipping 551 matching lines @@
 # ${1} specifies the location of the chroot.
 chroot_hacks_from_outside() {
   # Give args better names.
   local chroot_dir=$1
 
   # Add root as a sudoer if not already done.
   if ! sudo grep -q '^root ALL=(ALL) ALL$' "${chroot_dir}/etc/sudoers" ; then
     info "Upgrading old chroot (pre 2010-10-19) - adding root to sudoers"
     sudo bash -c "echo root ALL=\(ALL\) ALL >> \"${chroot_dir}/etc/sudoers\""
   fi
+
+  # Add chromite stuff if not already done.
+  if ! grep -q "^PATH=.*/trunk/chromite/bin" "${chroot_dir}/home/$USER/.bashrc"; then

[rochberg, 2011/02/09 22:00:16]

CHROOT_HOME="${chroot_dir}/home/$USER" would fix both line breaks and maybe even
make the code easier to read.

+    info "Upgrading old chroot (pre 2011-02-09) - adding chromite to path"
+    echo "PATH=\$PATH:/home/$USER/trunk/chromite/bin" >> \
+      "${chroot_dir}/home/$USER/.bashrc"
+  fi
+  if ! [ -L "${chroot_dir}/home/$USER/.local/lib/python2.6/site-packages/chromite" ]; then

[diandersAtChromium, 2011/02/09 21:53:07]

Is there a good way to wrap this line?  ...or are we OK with it being a little
long?

+    info "Upgrading old chroot (pre 2011-02-09) - adding chromite to site-packages"
+    mkdir -p "${chroot_dir}/home/$USER/.local/lib/python2.6/site-packages"
+    ln -s ../../../../trunk/chromite \
+      "${chroot_dir}/home/$USER/.local/lib/python2.6/site-packages/"
+  fi
 }
 
 # The board and variant command line options can be used in a number of ways
 # to specify the board and variant.  The board can encode both pieces of
 # information separated by underscores.  Or the variant can be passed using
 # the separate variant option.  This function extracts the canonical board and
 # variant information and provides it in the BOARD, VARIANT and BOARD_VARIANT
 # variables.
 get_board_and_variant() {
   local flags_board="${1}"
   local flags_variant="${2}"
 
   BOARD=$(echo "$flags_board" | cut -d '_' -f 1)
   VARIANT=${flags_variant:-$(echo "$flags_board" | cut -s -d '_' -f 2)}
 
   if [ -n "$VARIANT" ]; then
     BOARD_VARIANT="${BOARD}_${VARIANT}"
   else
     BOARD_VARIANT="${BOARD}"
   fi
 }