Remove env var dep from linux packaging.

chrome/installer/linux/rpm/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 151 matching lines @@
 }
 
 # Remove temporary files and unwanted packaging output.
 cleanup() {
   rm -rf "${STAGEDIR}"
   rm -rf "${TMPFILEDIR}"
 }
 
 usage() {
   echo "usage: $(basename $0) [-c channel] [-a target_arch] [-o 'dir']"
-  echo "                      [-b 'dir']"
+  echo "                      [-b 'dir'] -d branding"
   echo "-c channel the package channel (trunk, asan, unstable, beta, stable)"
   echo "-a arch    package architecture (ia32 or x64)"
   echo "-o dir     package output directory [${OUTPUTDIR}]"
   echo "-b dir     build input directory    [${BUILDDIR}]"
+  echo "-d brand   either chromium or google_chrome"
   echo "-h         this help message"
 }
 
 # Check that the channel name is one of the allowable ones.
 verify_channel() {
   case $CHANNEL in
     stable )
       CHANNEL=stable
       # TODO(phajdan.jr): Remove REPLACES completely.
       REPLACES="dummy"
@@ skipping 20 matching lines @@
     * )
       echo
       echo "ERROR: '$CHANNEL' is not a valid channel type."
       echo
       exit 1
       ;;
   esac
 }
 
 process_opts() {
-  while getopts ":o:b:c:a:h" OPTNAME
+  while getopts ":o:b:c:a:d:h" OPTNAME
   do
     case $OPTNAME in
       o )
         OUTPUTDIR=$(readlink -f "${OPTARG}")
         mkdir -p "${OUTPUTDIR}"
         ;;
       b )
         BUILDDIR=$(readlink -f "${OPTARG}")
         ;;
       c )
         CHANNEL="$OPTARG"
         verify_channel
         ;;
       a )
         TARGETARCH="$OPTARG"
         ;;
+      d )
+        BRANDING="$OPTARG"
+        ;;
       h )
         usage
         exit 0
         ;;
       \: )
         echo "'-$OPTARG' needs an argument."
         usage
         exit 1
         ;;
       * )
@@ skipping 24 matching lines @@
 
 # call cleanup() on exit
 trap cleanup 0
 process_opts "$@"
 BUILDDIR=${BUILDDIR:=$(readlink -f "${SCRIPTDIR}/../../../../out/Release")}
 
 source ${BUILDDIR}/installer/common/installer.include
 
 get_version_info
 
-if [ "$CHROMIUM_BUILD" = "_google_chrome" ]; then
+if [ "$BRANDING" = "google_chrome" ]; then
   source "${BUILDDIR}/installer/common/google-chrome.info"
 else
   source "${BUILDDIR}/installer/common/chromium-browser.info"
 fi
 eval $(sed -e "s/^\([^=]\+\)=\(.*\)$/export \1='\2'/" \
   "${BUILDDIR}/installer/theme/BRANDING")
 
 REPOCONFIG="http://dl.google.com/linux/${PACKAGE#google-}/rpm/stable"
 SSLREPOCONFIG="https://dl.google.com/linux/${PACKAGE#google-}/rpm/stable"
 verify_channel
@@ skipping 13 matching lines @@
     ;;
   * )
     echo
     echo "ERROR: Don't know how to build RPMs for '$TARGETARCH'."
     echo
     exit 1
     ;;
 esac
 
 do_package