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

Unified Diff: chrome/installer/linux/common/symlinks.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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/installer/linux/common/symlinks.include
diff --git a/chrome/installer/linux/common/symlinks.include b/chrome/installer/linux/common/symlinks.include
index 700215c4c9d1b2141a3487783dffa44dc9a19002..61a38597d506c02ac63452133b13995fcf00fc6e 100644
--- a/chrome/installer/linux/common/symlinks.include
+++ b/chrome/installer/linux/common/symlinks.include
@@ -7,9 +7,9 @@ add_nss_symlinks() {
do
target=$(echo $f | sed 's/\.[01]d$//')
if [ -f "/$LIBDIR/$target" ]; then
- ln -snf "/$LIBDIR/$target" "@@INSTALLDIR@@/$f"
+ ln -snf "/$LIBDIR/$target" "${INSTALLDIR}/$f"
elif [ -f "/usr/$LIBDIR/$target" ]; then
- ln -snf "/usr/$LIBDIR/$target" "@@INSTALLDIR@@/$f"
+ ln -snf "/usr/$LIBDIR/$target" "${INSTALLDIR}/$f"
else
echo $f not found in "/$LIBDIR/$target" or "/usr/$LIBDIR/$target".
exit 1
@@ -17,13 +17,21 @@ add_nss_symlinks() {
done
}
+add_chrome_symlinks() {
+ ln -snf "${INSTALLDIR}/@@PACKAGE@@" "/usr/bin/@@USR_BIN_SYMLINK_NAME@@"
+}
+
remove_nss_symlinks() {
for f in $NSS_FILES
do
- rm -rf "@@INSTALLDIR@@/$f"
+ rm -rf "${INSTALLDIR}/$f"
done
}
remove_udev_symlinks() {
- rm -rf "@@INSTALLDIR@@/libudev.so.0"
+ rm -rf "${INSTALLDIR}/libudev.so.0"
+}
+
+remove_chrome_symlinks() {
+ rm -rf "/usr/bin/@@USR_BIN_SYMLINK_NAME@@"
}

Powered by Google App Engine
This is Rietveld 408576698