chrome/installer/linux/common/wrapper - Issue 190473005: Respect CHROME_USER_DATA_DIR in start-up scripts.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/installer/linux/common/wrapper

Issue 190473005: Respect CHROME_USER_DATA_DIR in start-up scripts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Reviewer feedback. Created 6 years, 9 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 | Annotate | Revision Log

OLD	NEW
1 #!/bin/bash	1 #!/bin/bash

2 #	2 #

3 # Copyright (c) 2011 The Chromium Authors. All rights reserved.	3 # Copyright (c) 2011 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 # Let the wrapped binary know that it has been run through the wrapper.	7 # Let the wrapped binary know that it has been run through the wrapper.

8 export CHROME_WRAPPER="`readlink -f "$0"`"	8 export CHROME_WRAPPER="`readlink -f "$0"`"

9	9

10 HERE="`dirname "$CHROME_WRAPPER"`"	10 HERE="`dirname "$CHROME_WRAPPER"`"

(...skipping 30 matching lines...) Expand all Loading...
41	41

42 # Automagically migrate user data directory.	42 # Automagically migrate user data directory.

43 # TODO(phajdan.jr): Remove along with migration code in the browser for M33.	43 # TODO(phajdan.jr): Remove along with migration code in the browser for M33.

44 if [[ -n "@@SXS_USER_DATA_DIR@@" ]]; then	44 if [[ -n "@@SXS_USER_DATA_DIR@@" ]]; then

45 if [[ ! -d "@@SXS_USER_DATA_DIR@@" ]]; then	45 if [[ ! -d "@@SXS_USER_DATA_DIR@@" ]]; then

46 "$HERE/@@PROGNAME@@" "--migrate-data-dir-for-sxs=@@SXS_USER_DATA_DIR@@" \	46 "$HERE/@@PROGNAME@@" "--migrate-data-dir-for-sxs=@@SXS_USER_DATA_DIR@@" \

47 --enable-logging=stderr --log-level=0	47 --enable-logging=stderr --log-level=0

48 fi	48 fi

49 fi	49 fi

50	50

	51 # Make sure that the profile directory specified in the environment, if any,

	52 # overrides the default.

	53 if [[ -n "$CHROME_USER_DATA_DIR" ]]; then

	54 PROFILE_DIRECTORY_FLAG="--user-data-dir=$CHROME_USER_DATA_DIR"

	55 fi

	56

51 # Note: exec -a below is a bashism.	57 # Note: exec -a below is a bashism.

52 exec -a "$0" "$HERE/@@PROGNAME@@" @@DEFAULT_FLAGS@@ "$@"	58 exec -a "$0" "$HERE/@@PROGNAME@@" @@DEFAULT_FLAGS@@ "$PROFILE_DIRECTORY_FLAG" \

	59 "$@"

OLD	NEW

« no previous file with comments | « no previous file | no next file » | no next file with comments »