Fix common.sh to work in it's new location at /usr/lib/crosutils.

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.
 #set -e
 
 # The number of jobs to pass to tools that can run in parallel (such as make
 # and dpkg-buildpackage
 NUM_JOBS=`grep -c "^processor" /proc/cpuinfo`
 
 # Store location of the calling script.
 TOP_SCRIPT_DIR="${TOP_SCRIPT_DIR:-$(dirname $0)}"
 
+# Detect whether we're inside a chroot or not
+if [ -e /etc/debian_chroot ]
+then
+  INSIDE_CHROOT=1
+else
+  INSIDE_CHROOT=0
+fi
+
+# Construct a list of possible locations for the source tree.  This list is
+# based on various environment variables and globals that may have been set
+# by the calling script.
+function get_gclient_root_list() {
+  if [ $INSIDE_CHROOT -eq 1 ]; then echo "/home/${USER}/trunk"

[davidjames, 2011/01/26 23:41:33]

Since this isn't a one-line if statement, better to put a newline between 'then'
and 'echo'.

[robotboy, 2011/01/26 23:59:34]

Done.

+    if [ ! -z "${SUDO_USER}" ]; then echo "/home/${SUDO_USER}/trunk"; fi

[davidjames, 2011/01/26 23:41:33]

Any reason why you didn't use -n here (and elsewhere) instead of -z?

[robotboy, 2011/01/26 23:59:34]

Done.

+  fi
+
+  if [ ! -z "${COMMON_SH}" ]; then echo "$(dirname "$COMMON_SH")/../.."; fi
+  if [ ! -z "${BASH_SOURCE}" ]; then echo "$(dirname "$BASH_SOURCE")/../.."; fi
+}
+
+# Based on the list of possible source locations we set GCLIENT_ROOT if it is
+# not already defined by looking for a src directory in each seach path
+# location.  If we do not find a valid looking root we error out.
+function get_gclient_root() {
+  if [ ! -z "${GCLIENT_ROOT}" ]; then
+    return
+  fi
+
+  for path in $(get_gclient_root_list); do
+    if [ -d "${path}/src" ]; then
+      GCLIENT_ROOT=${path}
+      break
+    fi
+  done
+
+  if [ -z "${GCLIENT_ROOT}" ]; then
+    # Using dash or sh, we don't know where we are.  $0 refers to the calling
+    # script, not ourselves, so that doesn't help us.
+    echo "Unable to determine location for common.sh.  If you are sourcing"
+    echo "common.sh from a script run via dash or sh, you must do it in the"
+    echo "following way:"
+    echo '  COMMON_SH="$(dirname "$0")/../../scripts/common.sh"'
+    echo '  . "$COMMON_SH"'
+    echo "where the first line is the relative path from your script to"
+    echo "common.sh."
+    exit 1
+  fi
+}
+
 # Find root of source tree
-if [ "x$GCLIENT_ROOT" != "x" ]
-then
-  # GCLIENT_ROOT already set, so we're done
-  true
-elif [ "x$COMMON_SH" != "x" ]
-then
-  # COMMON_SH set, so assume that's us
-  GCLIENT_ROOT="$(dirname "$COMMON_SH")/../.."
-elif [ "x$BASH_SOURCE" != "x" ]
-then
-  # Using bash, so we can find ourselves
-  GCLIENT_ROOT="$(dirname "$BASH_SOURCE")/../.."
-else
-  # Using dash or sh, we don't know where we are.  $0 refers to the calling
-  # script, not ourselves, so that doesn't help us.
-  echo "Unable to determine location for common.sh.  If you are sourcing"
-  echo "common.sh from a script run via dash or sh, you must do it in the"
-  echo "following way:"
-  echo '  COMMON_SH="$(dirname "$0")/../../scripts/common.sh"'
-  echo '  . "$COMMON_SH"'
-  echo "where the first line is the relative path from your script to"
-  echo "common.sh."
-  exit 1
-fi
+get_gclient_root
 
 # Canonicalize the directories for the root dir and the calling script.
 # readlink is part of coreutils and should be present even in a bare chroot.
 # This is better than just using
 #     FOO = "$(cd $FOO ; pwd)"
 # since that leaves symbolic links intact.
 # Note that 'realpath' is equivalent to 'readlink -f'.
 TOP_SCRIPT_DIR=`readlink -f $TOP_SCRIPT_DIR`
 GCLIENT_ROOT=`readlink -f $GCLIENT_ROOT`
 
@@ skipping 54 matching lines @@
 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
-if [ -e /etc/debian_chroot ]
-then
-  INSIDE_CHROOT=1
-else
-  INSIDE_CHROOT=0
-fi
-
 # Directory locations inside the dev chroot
 CHROOT_TRUNK_DIR="/home/$USER/trunk"
 
 # Install make for portage ebuilds.  Used by build_image and gmergefs.
 # TODO: Is /usr/local/autotest-chrome still used by anyone?
 DEFAULT_INSTALL_MASK="
   *.a
   *.la
   /etc/init.d
   /etc/runlevels
@@ skipping 438 matching lines @@
 
   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
 }