Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(77)

Unified Diff: common.sh

Issue 6265028: Fix common.sh to work in it's new location at /usr/lib/crosutils. (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/crosutils.git@master
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: common.sh
diff --git a/common.sh b/common.sh
index a4d91384339d8fc61b450229f2149111eea1c3e1..4fe71e4c5b42e02cd9cd6a83f85640e3d7aadb45 100644
--- a/common.sh
+++ b/common.sh
@@ -17,11 +17,24 @@ 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
+
# Find root of source tree
if [ "x$GCLIENT_ROOT" != "x" ]
then
# GCLIENT_ROOT already set, so we're done
true
+elif [ $INSIDE_CHROOT -eq 1 ]
+then
+ # If we are inside the chroot and we haven't been told otherwise, we assume
+ # that the GCLIENT_ROOT is ~/trunk.
+ GCLIENT_ROOT="${HOME}/trunk"
elif [ "x$COMMON_SH" != "x" ]
then
# COMMON_SH set, so assume that's us
@@ -116,14 +129,6 @@ 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"
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698