restart_in_chroot_if_needed can run scripts from bin/. cros_workon_now does this

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 88 matching lines @@
 # Default location for chroot
 DEFAULT_CHROOT_DIR=${CHROMEOS_CHROOT_DIR:-"$GCLIENT_ROOT/chroot"}
 
 # All output files from build should go under $DEFAULT_BUILD_ROOT, so that
 # they don't pollute the source directory.
 DEFAULT_BUILD_ROOT=${CHROMEOS_BUILD_ROOT:-"$SRC_ROOT/build"}
 
 # Set up a global ALL_BOARDS value
 if [ -d $SRC_ROOT/overlays ]; then
   ALL_BOARDS=$(cd $SRC_ROOT/overlays;ls -1d overlay-* 2>&-|sed 's,overlay-,,g')
-fi 
+fi
 # Strip CR
 ALL_BOARDS=$(echo $ALL_BOARDS)
 # Set a default BOARD
 #DEFAULT_BOARD=x86-generic # or...
 DEFAULT_BOARD=$(echo $ALL_BOARDS | awk '{print $NF}')
 
 # Enable --fast by default.
 DEFAULT_FAST="${FLAGS_TRUE}"
 
 # Detect whether we're inside a chroot or not
@@ skipping 104 matching lines @@
   pushd "$TOP_SCRIPT_DIR"
   rm -f ../${PKG_BASE}_*.deb
   dpkg-buildpackage -b -tc -us -uc -j$NUM_JOBS
   mv ../${PKG_BASE}_*.deb "$OUT_DIR"
   rm ../${PKG_BASE}_*.changes
   popd
 }
 
 # Enter a chroot and restart the current script if needed
 function restart_in_chroot_if_needed {
+  # NB:  Pass in ARGV:  restart_in_chroot_if_needed "$@"
   if [ $INSIDE_CHROOT -ne 1 ]
   then
-    # Equivalent to enter_chroot.sh -- <current command>
+    local abspath=$(readlink -f "$0")
+    # strip everything up to (and including) /src/scripts/ from abspath
+    local path_from_scripts="${abspath##*/src/scripts/}"
     exec $SCRIPTS_DIR/enter_chroot.sh -- \
-      $CHROOT_TRUNK_DIR/src/scripts/$(basename $0) $*
+      "$CHROOT_TRUNK_DIR/src/scripts/$path_from_scripts" "$@"
+    exit
   fi
 }
 
 # Fail unless we're inside the chroot.  This guards against messing up your
 # workstation.
 function assert_inside_chroot {
   if [ $INSIDE_CHROOT -ne 1 ]
   then
     echo "This script must be run inside the chroot.  Run this first:"
     echo "    $SCRIPTS_DIR/enter_chroot.sh"
@@ skipping 267 matching lines @@
 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
 }