Bug squash

This commit is contained in:
2021-12-02 20:05:24 -05:00
parent f6af090431
commit a1892c5a25

View File

@@ -338,7 +338,7 @@ getLatestVersion() {
#_base_next="bullseye" # TODO use for fallback to smooth upgrades #_base_next="bullseye" # TODO use for fallback to smooth upgrades
# Legacy # Legacy
_boardurl26="https://yabb.jriver.com/interact/index.php/board,64.0.html" # jessie/stretch #_boardurl26="https://yabb.jriver.com/interact/index.php/board,64.0.html" # jessie/stretch
# Peg older versions to prevent ABI and dependency mismatches in automatic mode # Peg older versions to prevent ABI and dependency mismatches in automatic mode
# This can be overriden w/ --mcversion # This can be overriden w/ --mcversion
@@ -376,7 +376,7 @@ getLatestVersion() {
# Use a containerized package manager # Use a containerized package manager
# TODO but how to determine build distro ($_base=buster)? # TODO but how to determine build distro ($_base=buster)?
[[ ! -x $(command -v buildah) ]] && installPackage --silent buildah [[ ! -x $(command -v buildah) ]] && installPackage --silent buildah
if [[ -x $(command -v buildah) ]] && CNT=$(buildah from debian$_base); then if [[ -x $(command -v buildah) ]] && CNT=$(buildah from debian:$_base); then
buildah run "$CNT" -- bash -c \ buildah run "$CNT" -- bash -c \
"echo 'deb [trusted=yes arch=amd64,i386,armhf,arm64] http://dist.jriver.com/latest/mediacenter/ $_base main' > /etc/apt/sources.list 2>&1" "echo 'deb [trusted=yes arch=amd64,i386,armhf,arm64] http://dist.jriver.com/latest/mediacenter/ $_base main' > /etc/apt/sources.list 2>&1"
buildah run "$CNT" -- bash -c \ buildah run "$CNT" -- bash -c \