diff options
| author | Ben Murdoch <benm@google.com> | 2014-04-01 10:55:12 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-04-01 10:55:12 +0100 |
| commit | 4ad1aa43a48567659193a298fad74f55e00b3dd9 (patch) | |
| tree | b98c2a945dbec61aeb9edef5e371f905e7ab5b37 /chrome/installer | |
| parent | e92e8c41ae2718e381c0796a2c0b115a7d017a21 (diff) | |
| download | chromium_org-4ad1aa43a48567659193a298fad74f55e00b3dd9.tar.gz | |
Merge from Chromium at DEPS revision 260540
This commit was generated by merge_to_master.py.
Change-Id: I10b8e4931992bb84eb4da800a337bbd0a52f6588
Diffstat (limited to 'chrome/installer')
| -rwxr-xr-x | chrome/installer/linux/common/wrapper | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/installer/linux/common/wrapper b/chrome/installer/linux/common/wrapper index 22d642fd04..4194365a27 100755 --- a/chrome/installer/linux/common/wrapper +++ b/chrome/installer/linux/common/wrapper @@ -48,5 +48,12 @@ if [[ -n "@@SXS_USER_DATA_DIR@@" ]]; then fi fi +# Make sure that the profile directory specified in the environment, if any, +# overrides the default. +if [[ -n "$CHROME_USER_DATA_DIR" ]]; then + PROFILE_DIRECTORY_FLAG="--user-data-dir=$CHROME_USER_DATA_DIR" +fi + # Note: exec -a below is a bashism. -exec -a "$0" "$HERE/@@PROGNAME@@" @@DEFAULT_FLAGS@@ "$@" +exec -a "$0" "$HERE/@@PROGNAME@@" @@DEFAULT_FLAGS@@ "$PROFILE_DIRECTORY_FLAG" \ + "$@" |