summaryrefslogtreecommitdiffstats
path: root/build/install-chroot.sh
diff options
context:
space:
mode:
authortansell@google.com <tansell@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-17 16:47:59 +0000
committertansell@google.com <tansell@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-17 16:47:59 +0000
commitd818503bb762833c52299f30d970295f1d72f262 (patch)
treee9effe517723994d24c1a3f8884d8233e33bba01 /build/install-chroot.sh
parent8d8622a4617c7208ea9620308efec0a0a868fe1a (diff)
downloadchromium_src-d818503bb762833c52299f30d970295f1d72f262.zip
chromium_src-d818503bb762833c52299f30d970295f1d72f262.tar.gz
chromium_src-d818503bb762833c52299f30d970295f1d72f262.tar.bz2
Always reference newly created script using full path.
When running build/install-chroot.sh to setup a Lucid64 environment for testing on a Ubuntu Precise box the script fails with sudo: lucid64: command not found This is because in Ubuntu Precise root does not have /usr/local/bin in the path. Most references use the full path, this changes the remaining to do so too. BUG=155451 Review URL: https://chromiumcodereview.appspot.com/11187019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/install-chroot.sh')
-rwxr-xr-xbuild/install-chroot.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/build/install-chroot.sh b/build/install-chroot.sh
index adffa18..d2c06fc 100755
--- a/build/install-chroot.sh
+++ b/build/install-chroot.sh
@@ -658,7 +658,8 @@ if [ -x "${script}" ]; then
# possible, if it lives on a network filesystem that denies
# access to root.
tmp_script=
- if ! sudo "${target%bit}" sh -c "[ -x '${script}' ]" >&/dev/null; then
+ if ! sudo /usr/local/bin/"${target%bit}" \
+ sh -c "[ -x '${script}' ]" >&/dev/null; then
tmp_script="/tmp/${script##*/}"
cp "${script}" "${tmp_script}"
fi
@@ -768,7 +769,7 @@ if [ ! -h "${HOME}/chroot" ] &&
fi
# Clean up package files
-sudo schroot -c "${target%bit}" -p -- apt-get clean
+sudo schroot -c /usr/local/bin/"${target%bit}" -p -- apt-get clean
sudo apt-get clean
trap '' INT TERM QUIT HUP
@@ -780,8 +781,8 @@ cat <<EOF
Successfully installed ${distname} ${arch}
-You can run programs inside of the chroot by invoking the "${target%bit}"
-command.
+You can run programs inside of the chroot by invoking the
+"/usr/local/bin/${target%bit}" command.
This command can be used with arguments, in order to just run a single
program inside of the chroot environment (e.g. "${target%bit} make chrome")