| 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@@"
|
| }
|
|
|