AppShell: Add missing substitutions for installer template

A new RECOMMENDS field was added to the templates for debian packaging
in https://crrev.com/c/924193, but the substitution wasn't added to the
template processor for AppShell's installer.

This is a band-aid; code like this should be moved into a common place,
like a component that creates installers given product-specific
arguments.

This regression wasn't detected because the CQ doesn't build the
AppShell installer. With the Chrome installer added to Linux CQ bots
(issue 758654), we should consider building the AppShell installer too.

Bug: 729667,820270
Change-Id: I265a3823b8523e15ff295d7f5e46c4b4b9d84f8d
Reviewed-on: https://chromium-review.googlesource.com/956603Reviewed-by: Michael Moss <mmoss@chromium.org>
Commit-Queue: Michael Giuffrida <michaelpg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541941}

extensions/shell/installer/linux/common/installer.include

-# TODO(michaelpg): Dedupe common functionality with the Chrome installer.
+# TODO(michaelpg): Dedupe common functionality with the Chrome installer. See
+# https://crbug.com/820270.
 
 # Recursively replace @@include@@ template variables with the referenced file,
 # and write the resulting text to stdout.
@@ -53,6 +54,7 @@ process_template() (
   TMPLINCL="$(process_template_includes "$TMPLIN")"
   sed \
     -e "s#@@PACKAGE@@#${PACKAGE}#g" \
+    -e "s#@@PACKAGE_ORIG@@#${PACKAGE_ORIG}#g" \
     -e "s#@@PACKAGE_FILENAME@@#${PACKAGE_FILENAME}#g" \
     -e "s#@@PROGNAME@@#${PROGNAME}#g" \
     -e "s#@@CHANNEL@@#${CHANNEL}#g" \
@@ -68,15 +70,18 @@ process_template() (
     -e "s#@@PRODUCTURL@@#${PRODUCTURL}#g" \
     -e "s#@@PREDEPENDS@@#${PREDEPENDS}#g" \
     -e "s#@@DEPENDS@@#${DEPENDS}#g" \
+    -e "s#@@RECOMMENDS@@#${RECOMMENDS}#g" \
     -e "s#@@PROVIDES@@#${PROVIDES}#g" \
-    -e "s#@@REPLACES@@#${REPLACES}#g" \
-    -e "s#@@CONFLICTS@@#${CONFLICTS}#g" \
     -e "s#@@ARCHITECTURE@@#${ARCHITECTURE}#g" \
     -e "s#@@MAINTNAME@@#${MAINTNAME}#g" \
     -e "s#@@MAINTMAIL@@#${MAINTMAIL}#g" \
+    -e "s#@@REPOCONFIG@@#${REPOCONFIG}#g" \
+    -e "s#@@REPOCONFIGREGEX@@#${REPOCONFIGREGEX}#g" \
     -e "s#@@SHORTDESC@@#${SHORTDESC}#g" \
     -e "s#@@FULLDESC@@#${FULLDESC}#g" \
     -e "s#@@USR_BIN_SYMLINK_NAME@@#${USR_BIN_SYMLINK_NAME:-}#g" \
+    -e "s#@@LOGO_RESOURCES_PNG@@#${LOGO_RESOURCES_PNG}#g" \
+    -e "s#@@LOGO_RESOURCE_XPM@@#${LOGO_RESOURCE_XPM}#g" \
     > "$TMPLOUT" <<< "$TMPLINCL"
 )
 

extensions/shell/installer/linux/debian/build.sh

@@ -66,8 +66,6 @@ do_package() {
   PREDEPENDS="$COMMON_PREDEPS"
   DEPENDS="${COMMON_DEPS}"
   RECOMMENDS="${COMMON_RECOMMENDS}"
-  REPLACES=""
-  CONFLICTS=""
   PROVIDES=""
   gen_changelog
   process_template "${SCRIPTDIR}/control.template" "${DEB_CONTROL}"