Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Side by Side Diff: chrome/installer/linux/debian/build.sh

Issue 1804263002: Require multiarch setting in Linux repo config file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2661
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 exit 1 332 exit 1
333 ;; 333 ;;
334 esac 334 esac
335 BASEREPOCONFIG="dl.google.com/linux/chrome/deb/ stable main" 335 BASEREPOCONFIG="dl.google.com/linux/chrome/deb/ stable main"
336 # Only use the default REPOCONFIG if it's unset (e.g. verify_channel might have 336 # Only use the default REPOCONFIG if it's unset (e.g. verify_channel might have
337 # set it to an empty string) 337 # set it to an empty string)
338 REPOCONFIG="${REPOCONFIG-deb [arch=${ARCHITECTURE}] http://${BASEREPOCONFIG}}" 338 REPOCONFIG="${REPOCONFIG-deb [arch=${ARCHITECTURE}] http://${BASEREPOCONFIG}}"
339 # Allowed configs include optional HTTPS support and explicit multiarch 339 # Allowed configs include optional HTTPS support and explicit multiarch
340 # platforms. 340 # platforms.
341 REPOCONFIGREGEX="deb (\\\\[arch=[^]]*\\\\b${ARCHITECTURE}\\\\b[^]]*\\\\]" 341 REPOCONFIGREGEX="deb (\\\\[arch=[^]]*\\\\b${ARCHITECTURE}\\\\b[^]]*\\\\]"
342 REPOCONFIGREGEX+="[[:space:]]*)?https?://${BASEREPOCONFIG}" 342 REPOCONFIGREGEX+="[[:space:]]*) https?://${BASEREPOCONFIG}"
343 stage_install_debian 343 stage_install_debian
344 344
345 do_package 345 do_package
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698