diff options
| author | Aron Griffis <aron@arongriffis.com> | 2016-06-07 12:41:55 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-06-07 12:41:55 -0400 |
| commit | fd454e5b74bc0a87effd755986ce33bf05b4d27c (patch) | |
| tree | 85b87c39891403b12ac56dbd551ad8d4dc32dbb8 /util | |
| parent | 6b8b332f77e6e7413d2ebb9d47093bc93255958e (diff) | |
| download | qmk_firmware-fd454e5b74bc0a87effd755986ce33bf05b4d27c.tar.gz qmk_firmware-fd454e5b74bc0a87effd755986ce33bf05b4d27c.zip | |
Add support for vagrant-docker (#389)
* clean trailing ws in Vagrantfile and util/avr_setup.sh
* replace triple quotes with heredoc.
Ruby doesn't have triple quotes; that's a Python thing. This was just being
parsed as multiple strings concatenated.
* add docker support to Vagrantfile
* make wants to find dfu-programmer in vagrant guest
Diffstat (limited to 'util')
| -rw-r--r-- | util/avr_setup.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/util/avr_setup.sh b/util/avr_setup.sh index 34a8a3281..916d0378b 100644 --- a/util/avr_setup.sh +++ b/util/avr_setup.sh | |||
| @@ -38,8 +38,9 @@ elif [[ -n "$(type -P apt-get)" ]]; then | |||
| 38 | gcc-avr \ | 38 | gcc-avr \ |
| 39 | binutils-avr \ | 39 | binutils-avr \ |
| 40 | avr-libc \ | 40 | avr-libc \ |
| 41 | dfu-programmer \ | ||
| 41 | dfu-util | 42 | dfu-util |
| 42 | 43 | ||
| 43 | elif [[ -n "$(type -P yum)" ]]; then | 44 | elif [[ -n "$(type -P yum)" ]]; then |
| 44 | # Fedora, CentOS or RHEL and derivatives | 45 | # Fedora, CentOS or RHEL and derivatives |
| 45 | yum -y makecache && yum -y update | 46 | yum -y makecache && yum -y update |
| @@ -55,6 +56,7 @@ elif [[ -n "$(type -P yum)" ]]; then | |||
| 55 | avr-binutils \ | 56 | avr-binutils \ |
| 56 | avr-gcc \ | 57 | avr-gcc \ |
| 57 | avr-libc \ | 58 | avr-libc \ |
| 59 | dfu-programmer \ | ||
| 58 | dfu-util | 60 | dfu-util |
| 59 | 61 | ||
| 60 | elif [[ -n "$(type -P zypper)" ]]; then | 62 | elif [[ -n "$(type -P zypper)" ]]; then |