diff --git a/lib/docker.sh b/lib/docker.sh index 7fd6d3d..1fc6f64 100644 --- a/lib/docker.sh +++ b/lib/docker.sh @@ -71,7 +71,8 @@ docker_build_image() { echo 'SHELL ["/bin/bash", "-c"]' echo 'RUN ln -sf /bin/bash /bin/sh' echo 'ENV DEBIAN_FRONTEND=noninteractive' - echo "RUN ${pkg_mgr_update} && ${pkg_mgr_upgrade}" + echo "RUN ${pkg_mgr_update}" + echo "RUN ${pkg_mgr_upgrade}" printf "RUN ${pkg_install} %s\n" "${req_pkgs[@]}" echo 'RUN pipx install virtualenv' echo 'RUN pipx ensurepath' diff --git a/lib/install_deps.sh b/lib/install_deps.sh index 81c45bb..d32aaeb 100644 --- a/lib/install_deps.sh +++ b/lib/install_deps.sh @@ -12,7 +12,7 @@ determine_pkg_mgr() { brew:brew update:brew upgrade:brew install:brew list --formula ${pkg} apt-get:${SUDO}apt-get update:${SUDO}apt-get upgrade -y:${SUDO}apt-get install -y:dpkg -l ${pkg} pacman:${SUDO}pacman -Syy:${SUDO}pacman -Syu --noconfirm:${SUDO}pacman -S --noconfirm --needed:pacman -Qi ${pkg} -dnf:{ ${SUDO}dnf check-update || true }:${SUDO}dnf upgrade --refresh -y:${SUDO}dnf install -y:dnf list -q --installed ${pkg} +dnf:${SUDO}dnf check-update || true:${SUDO}dnf upgrade --refresh -y:${SUDO}dnf install -y:dnf list -q --installed ${pkg} ' local supported_pkg_mgr=() unset pkg_mgr pkg_mgr_update pkg_mgr_upgrade pkg_install pkg_check