diff --git a/chezmoi/.chezmoitemplates/install-apt-prerequisites b/chezmoi/.chezmoitemplates/install-apt-prerequisites index bacefd18..4f431b21 100644 --- a/chezmoi/.chezmoitemplates/install-apt-prerequisites +++ b/chezmoi/.chezmoitemplates/install-apt-prerequisites @@ -13,8 +13,8 @@ else echo "${output}" exit 1 fi -c sudo DEBIAN_FRONTEND=noninteractive apt-get install --yes -qq -o=Dpkg::Use-Pty=0 --no-install-recommends ca-certificates -c sudo DEBIAN_FRONTEND=noninteractive apt-get install --yes -qq -o=Dpkg::Use-Pty=0 --no-install-recommends curl wget gnupg \ +c sudo apt-get install --yes -qq -o=Dpkg::Use-Pty=0 --no-install-recommends ca-certificates +c sudo apt-get install --yes -qq -o=Dpkg::Use-Pty=0 --no-install-recommends curl wget gnupg \ software-properties-common zsh locales locales-all jq gettext autoconf apt-transport-https zip bzip2 unzip # Add APT repositories for newer versions of Git. @@ -24,7 +24,7 @@ c sudo DEBIAN_FRONTEND=noninteractive apt-get install --yes -qq -o=Dpkg::Use-Pty c sudo rm -f etc/apt/sources.list.d/git-core-*.list* c sudo add-apt-repository ppa:git-core/ppa --yes c sudo apt-get update --yes -c sudo DEBIAN_FRONTEND=noninteractive apt-get install --yes -qq -o=Dpkg::Use-Pty=0 --no-install-recommends git +c sudo apt-get install --yes -qq -o=Dpkg::Use-Pty=0 --no-install-recommends git # Set up locales # check if locale is already set up by running locale | grep LC_ALL | grep en_US.UTF-8 diff --git a/chezmoi/dot_local/bin/executable_dotfiles-install-apt-pkgs.tmpl b/chezmoi/dot_local/bin/executable_dotfiles-install-apt-pkgs.tmpl index 98c1c6c7..04a4d85e 100644 --- a/chezmoi/dot_local/bin/executable_dotfiles-install-apt-pkgs.tmpl +++ b/chezmoi/dot_local/bin/executable_dotfiles-install-apt-pkgs.tmpl @@ -142,9 +142,9 @@ done if [[ ${#missing_packages[@]} -gt 0 ]] || [[ ${#upgrade_packages[@]} -gt 0 ]]; then # This script also gets called when running rootmoi if [ "$USER" = "root" ]; then - apt_command=(DEBIAN_FRONTEND=noninteractive apt-get) + apt_command=(apt-get) else - apt_command=(sudo DEBIAN_FRONTEND=noninteractive apt-get) + apt_command=(sudo apt-get) fi c "${apt_command[@]}" update --yes -qq -o=Dpkg::Use-Pty=0