Linux SxS: Use a non-colliding path for Debian packages.

chrome/installer/linux/debian/build.sh

 #!/bin/bash
 #
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # TODO(mmoss) This currently only works with official builds, since non-official
 # builds don't add the "${BUILDDIR}/installer/" files needed for packaging.
 
 set -e
@@ skipping 35 matching lines @@
     "${STAGEDIR}/usr/share/doc/${PACKAGE}"
 }
 
 # Put the package contents in the staging area.
 stage_install_debian() {
   # Always use a different name for /usr/bin symlink depending on channel.
   # First, to avoid file collisions. Second, to make it possible to
   # use update-alternatives for /usr/bin/google-chrome.
   local USR_BIN_SYMLINK_NAME="${PACKAGE}-${CHANNEL}"
 
   if [ "$CHANNEL" != "stable" ]; then

[Paweł Hajdan Jr., 2013/11/22 17:55:46]

We don't do any path changes for the stable channel.

[Lei Zhang, 2013/11/22 19:48:45]

Right, I had that notion in my head but missed this line.

     # This would ideally be compiled into the app, but that's a bit too
     # intrusive of a change for these limited use channels, so we'll just hack
     # it into the wrapper script. The user can still override since it seems to
     # work to specify --user-data-dir multiple times on the command line, with
     # the last occurrence winning.
     local SXS_USER_DATA_DIR="\${XDG_CONFIG_HOME:-\${HOME}/.config}/${PACKAGE}-${CHANNEL}"
     local DEFAULT_FLAGS="--user-data-dir=\"${SXS_USER_DATA_DIR}\""
 
     # Avoid file collisions between channels.
+    local INSTALLDIR="${INSTALLDIR}-${CHANNEL}"
+
     # TODO(phajdan.jr): Do that for all packages for SxS,
     # http://crbug.com/38598 .
-    # We can't do this for now for all packages because of
-    # http://crbug.com/295103 , and ultimately http://crbug.com/22703 .
-    # Also see https://groups.google.com/a/chromium.org/d/msg/chromium-dev/DBEqOORaRiw/pE0bNI6h0kcJ .
     if [ "$CHANNEL" = "trunk" ] || [ "$CHANNEL" = "asan" ]; then
       local PACKAGE="${PACKAGE}-${CHANNEL}"
-      local INSTALLDIR="${INSTALLDIR}-${CHANNEL}"
     fi
 
     # Make it possible to distinguish between menu entries
     # for different channels.
     local MENUNAME="${MENUNAME} (${CHANNEL})"
   fi
   prep_staging_debian
   stage_install_common
   echo "Staging Debian install files in '${STAGEDIR}'..."
   install -m 755 -d "${STAGEDIR}/${INSTALLDIR}/cron"
   process_template "${BUILDDIR}/installer/common/repo.cron" \
       "${STAGEDIR}/${INSTALLDIR}/cron/${PACKAGE}"
   chmod 755 "${STAGEDIR}/${INSTALLDIR}/cron/${PACKAGE}"
   pushd "${STAGEDIR}/etc/cron.daily/"
   ln -snf "${INSTALLDIR}/cron/${PACKAGE}" "${PACKAGE}"
   popd
   process_template "${BUILDDIR}/installer/debian/debian.menu" \
     "${STAGEDIR}/usr/share/menu/${PACKAGE}.menu"
   chmod 644 "${STAGEDIR}/usr/share/menu/${PACKAGE}.menu"
   process_template "${BUILDDIR}/installer/debian/postinst" \
     "${STAGEDIR}/DEBIAN/postinst"
   chmod 755 "${STAGEDIR}/DEBIAN/postinst"
   process_template "${BUILDDIR}/installer/debian/prerm" \
     "${STAGEDIR}/DEBIAN/prerm"
   chmod 755 "${STAGEDIR}/DEBIAN/prerm"
   process_template "${BUILDDIR}/installer/debian/postrm" \
     "${STAGEDIR}/DEBIAN/postrm"
   chmod 755 "${STAGEDIR}/DEBIAN/postrm"
+
+  # Compatibility symlinks to avoid breaking Chrome on update.
+  # TODO(phajdan.jr): Remove before enabling SxS (obvious file collisions).
+  # See http://crbug.com/295103 , and ultimately http://crbug.com/22703 .
+  # Also see https://groups.google.com/a/chromium.org/d/msg/chromium-dev/DBEqOORaRiw/pE0bNI6h0kcJ .
+  if [ "$CHANNEL" != "stable" ] && \

[Lei Zhang, 2013/11/22 03:02:11]

nit: {CHANNEL}

[Paweł Hajdan Jr., 2013/11/22 17:55:46]

Done.

+     [ "${CHANNEL}" != "trunk" ] && \
+     [ "${CHANNEL}" != "asan" ]; then
+    mkdir -p "${STAGEDIR}/opt/google/chrome"
+    for x in chrome chrome-sandbox locales; do
+      ln -s "${INSTALLDIR}/${x}" "${STAGEDIR}/opt/google/chrome/${x}"
+    done
+    pushd "${STAGEDIR}/${INSTALLDIR}"
+    for x in *.pak; do
+      ln -s "${INSTALLDIR}/${x}" "${STAGEDIR}/opt/google/chrome/${x}"
+    done
+    popd
+  fi
 }
 
 # Actually generate the package file.
 do_package() {
   echo "Packaging ${ARCHITECTURE}..."
   PREDEPENDS="$COMMON_PREDEPS"
   DEPENDS="${COMMON_DEPS}"
   # Trunk is a special package, mostly for development testing, so don't make
   # it replace any installed release packages.
   if [ "$CHANNEL" != "trunk" ] && [ "$CHANNEL" != "asan" ]; then
@@ skipping 220 matching lines @@
     ;;
   * )
     echo
     echo "ERROR: Don't know how to build DEBs for '$TARGETARCH'."
     echo
     exit 1
     ;;
 esac
 
 do_package