chrome/installer/linux/common/variables.include - Issue 2107893004: Support relocatable RPM packages

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

Unified Diff: chrome/installer/linux/common/variables.include

Issue 2107893004: Support relocatable RPM packages (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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:

Index: chrome/installer/linux/common/variables.include

diff --git a/chrome/installer/linux/common/variables.include b/chrome/installer/linux/common/variables.include

index be94314fe1faebfe05a9bd2d57306ab539d793fb..e7d535163624aa01b9a6777dcc261dccd2e58050 100644

--- a/chrome/installer/linux/common/variables.include

+++ b/chrome/installer/linux/common/variables.include

@@ -1,3 +1,10 @@

+# Set the installation directory at install time.

+# Currently only does anything for RPM packages.

+INSTALLDIR="@@INSTALLDIR@@"

+if [ -n "${RPM_INSTALL_PREFIX-}" ]; then

+ INSTALLDIR="${RPM_INSTALL_PREFIX}"/${INSTALLDIR##"@@INSTALLDIRPREFIX@@/"}

+fi

# System-wide package configuration.

DEFAULTS_FILE="/etc/default/@@PACKAGE@@"