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

Side by Side Diff: build/update-linux-sandbox.sh

Issue 409133006: The sandbox setup script now uses CHROMIUM_OUT_DIR when defined. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/sh 1 #!/bin/sh
2 2
3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 BUILDTYPE="${BUILDTYPE:-Debug}" 7 BUILDTYPE="${BUILDTYPE:-Debug}"
8 CHROME_SRC_DIR="${CHROME_SRC_DIR:-$(dirname -- $(readlink -fn -- "$0"))/..}" 8 CHROME_SRC_DIR="${CHROME_SRC_DIR:-$(dirname -- $(readlink -fn -- "$0"))/..}"
9 CHROME_OUT_DIR="${CHROME_SRC_DIR}/out/${BUILDTYPE}" 9 CHROME_OUT_DIR="${CHROME_SRC_DIR}/${CHROMIUM_OUT_DIR:-out}/${BUILDTYPE}"
10 CHROME_SANDBOX_BUILD_PATH="${CHROME_OUT_DIR}/chrome_sandbox" 10 CHROME_SANDBOX_BUILD_PATH="${CHROME_OUT_DIR}/chrome_sandbox"
11 CHROME_SANDBOX_INST_PATH="/usr/local/sbin/chrome-devel-sandbox" 11 CHROME_SANDBOX_INST_PATH="/usr/local/sbin/chrome-devel-sandbox"
12 CHROME_SANDBOX_INST_DIR=$(dirname -- "$CHROME_SANDBOX_INST_PATH") 12 CHROME_SANDBOX_INST_DIR=$(dirname -- "$CHROME_SANDBOX_INST_PATH")
13 13
14 TARGET_DIR_TYPE=$(stat -f -c %t -- "${CHROME_SANDBOX_INST_DIR}" 2>/dev/null) 14 TARGET_DIR_TYPE=$(stat -f -c %t -- "${CHROME_SANDBOX_INST_DIR}" 2>/dev/null)
15 if [ $? -ne 0 ]; then 15 if [ $? -ne 0 ]; then
16 echo "Could not get status of ${CHROME_SANDBOX_INST_DIR}" 16 echo "Could not get status of ${CHROME_SANDBOX_INST_DIR}"
17 exit 1 17 exit 1
18 fi 18 fi
19 19
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 fi 66 fi
67 else 67 else
68 echo "Your setuid sandbox is up to date" 68 echo "Your setuid sandbox is up to date"
69 if [ "${CHROME_DEVEL_SANDBOX}" != "${CHROME_SANDBOX_INST_PATH}" ]; then 69 if [ "${CHROME_DEVEL_SANDBOX}" != "${CHROME_SANDBOX_INST_PATH}" ]; then
70 echo -n "Make sure you have \"export " 70 echo -n "Make sure you have \"export "
71 echo -n "CHROME_DEVEL_SANDBOX=${CHROME_SANDBOX_INST_PATH}\" " 71 echo -n "CHROME_DEVEL_SANDBOX=${CHROME_SANDBOX_INST_PATH}\" "
72 echo "somewhere in your .bashrc" 72 echo "somewhere in your .bashrc"
73 echo "This variable is currently: ${CHROME_DEVEL_SANDBOX:-empty}" 73 echo "This variable is currently: ${CHROME_DEVEL_SANDBOX:-empty}"
74 fi 74 fi
75 fi 75 fi
OLDNEW
« 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