| OLD | NEW |
| 1 #!/bin/bash | 1 #!/bin/bash |
| 2 # | 2 # |
| 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
| 6 | 6 |
| 7 # TODO(mmoss) This currently only works with official builds, since non-official | 7 # TODO(mmoss) This currently only works with official builds, since non-official |
| 8 # builds don't add the "${BUILDDIR}/installer/" files needed for packaging. | 8 # builds don't add the "${BUILDDIR}/installer/" files needed for packaging. |
| 9 | 9 |
| 10 set -e | 10 set -e |
| (...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 323 exit 1 | 323 exit 1 |
| 324 ;; | 324 ;; |
| 325 esac | 325 esac |
| 326 BASEREPOCONFIG="dl.google.com/linux/chrome/deb/ stable main" | 326 BASEREPOCONFIG="dl.google.com/linux/chrome/deb/ stable main" |
| 327 # Only use the default REPOCONFIG if it's unset (e.g. verify_channel might have | 327 # Only use the default REPOCONFIG if it's unset (e.g. verify_channel might have |
| 328 # set it to an empty string) | 328 # set it to an empty string) |
| 329 REPOCONFIG="${REPOCONFIG-deb [arch=${ARCHITECTURE}] http://${BASEREPOCONFIG}}" | 329 REPOCONFIG="${REPOCONFIG-deb [arch=${ARCHITECTURE}] http://${BASEREPOCONFIG}}" |
| 330 # Allowed configs include optional HTTPS support and explicit multiarch | 330 # Allowed configs include optional HTTPS support and explicit multiarch |
| 331 # platforms. | 331 # platforms. |
| 332 REPOCONFIGREGEX="deb (\\\\[arch=[^]]*\\\\b${ARCHITECTURE}\\\\b[^]]*\\\\]" | 332 REPOCONFIGREGEX="deb (\\\\[arch=[^]]*\\\\b${ARCHITECTURE}\\\\b[^]]*\\\\]" |
| 333 REPOCONFIGREGEX+="[[:space:]]*)?https?://${BASEREPOCONFIG}" | 333 REPOCONFIGREGEX+="[[:space:]]*) https?://${BASEREPOCONFIG}" |
| 334 stage_install_debian | 334 stage_install_debian |
| 335 | 335 |
| 336 do_package | 336 do_package |
| OLD | NEW |