浏览代码

Chain apt container commands

bryan 1 天之前
父节点
当前提交
8cd6f690ab
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      installJRMC

+ 3 - 3
installJRMC

@@ -1843,8 +1843,8 @@ create_mc_apt_container() {
   { command -v buildah &>/dev/null || install_package buildah &>/dev/null; } &&
   { command -v buildah &>/dev/null || install_package buildah &>/dev/null; } &&
   CNT=$(sudo buildah from --quiet alpine:edge 2>/dev/null) &&
   CNT=$(sudo buildah from --quiet alpine:edge 2>/dev/null) &&
   sudo buildah run "$CNT" -- sh -c '
   sudo buildah run "$CNT" -- sh -c '
-    apk add --no-cache apt curl gnupg &>/dev/null
-    curl -fsSL https://dist.jriver.com/mediacenter@jriver.com.gpg.key | gpg --dearmor -o /usr/share/keyrings/jriver-com-archive-keyring.gpg &>/dev/null
+    apk add --no-cache apt curl gnupg &>/dev/null &&
+    curl -fsSL https://dist.jriver.com/mediacenter@jriver.com.gpg.key | gpg --dearmor -o /usr/share/keyrings/jriver-com-archive-keyring.gpg &>/dev/null &&
     cat <<-EOF > /etc/apt/sources.list.d/jriver.sources
     cat <<-EOF > /etc/apt/sources.list.d/jriver.sources
 			Types: deb
 			Types: deb
 			URIs: https://dist.jriver.com/latest/mediacenter/
 			URIs: https://dist.jriver.com/latest/mediacenter/
@@ -1852,7 +1852,7 @@ create_mc_apt_container() {
 			Suites: '"$MC_REPO"'
 			Suites: '"$MC_REPO"'
 			Components: main
 			Components: main
 			Architectures: '"$MC_ARCH"'
 			Architectures: '"$MC_ARCH"'
-		EOF
+		EOF &&
     apt-get update --allow-insecure-repositories &>/dev/null' &&
     apt-get update --allow-insecure-repositories &>/dev/null' &&
   # If user passes command strings run them in the container
   # If user passes command strings run them in the container
   for cmd in "${cmds[@]}"; do
   for cmd in "${cmds[@]}"; do