X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=avr_setup.sh;h=34a8a3281b3abbe0b541695271d09caa8568e6de;hb=6bafe444865e228ddcae2234549f1fd0931d89ad;hp=cd7412d748478d0e1ca7d00c4a8fb91eaa76b281;hpb=ee424f86081c538fc74c3e9b50c7b1eb595b6e58;p=qmk_firmware.git

diff --git a/avr_setup.sh b/avr_setup.sh
index cd7412d74..34a8a3281 100644
--- a/avr_setup.sh
+++ b/avr_setup.sh
@@ -11,21 +11,62 @@ if [[ -n "$(type -P pacman )" ]]; then
   # Always run the pacman mirror update script if possible when vagrant comes up
   # This will ensure that users never get stalled on a horribly slow mirror
   pacman -Syyu --needed --noconfirm
-  pacman -S --needed --noconfirm base-devel avr-gcc avr-binutils avr-libc dfu-util
+  pacman -S --needed --noconfirm \
+    base-devel \
+    avr-gcc \
+    avr-binutils \
+    avr-libc \
+    dfu-util
 
 elif [[ -n "$(type -P apt-get)" ]]; then
   # Debian and derivatives
-  apt-get update -y && apt-get upgrade -y
-  apt-get install -y build-essential gcc unzip wget zip gcc-avr binutils-avr avr-libc
+  # This block performs completely non-interactive updates {{
+  export DEBIAN_FRONTEND=noninteractive
+  export DEBCONF_NONINTERACTIVE_SEEN=true
+  echo "grub-pc hold" | dpkg --set-selections
+  apt-get -y update
+  apt-get -y --allow-unauthenticated upgrade \
+	  -o Dpkg::Options::="--force-confdef" \
+	  -o Dpkg::Options::="--force-confold"
+  # }}
+  apt-get install -y \
+    build-essential \
+    gcc \
+    unzip \
+    wget \
+    zip \
+    gcc-avr \
+    binutils-avr \
+    avr-libc \
+    dfu-util
   
 elif [[ -n "$(type -P yum)" ]]; then
   # Fedora, CentOS or RHEL and derivatives
   yum -y makecache && yum -y update
-  yum -y install gcc glibc-headers kernel-devel kernel-headers make perl git wget
+  yum -y install \
+    gcc \
+    glibc-headers \
+    kernel-devel \
+    kernel-headers \
+    make \
+    perl \
+    git \
+    wget \
+    avr-binutils \
+    avr-gcc \
+    avr-libc \
+    dfu-util
 
 elif [[ -n "$(type -P zypper)" ]]; then
   # openSUSE
-  zypper refresh --non-interactive && zypper update --non-interactive
-  zypper --non-interactive install git make gcc kernel-devel patch wget
+  zypper --non-interactive refresh  && zypper --non-interactive update
+  zypper --non-interactive install \
+    git \
+    make \
+    gcc \
+    kernel-devel \
+    patch \
+    wget \
+    dfu-programmer
 
 fi