Adding update of vagrant VM every time it is booted

diff --git a/Vagrantfile b/Vagrantfile
index e1082a08d030478fe7a41fc8884f4bdc8df107a3..788e014def4b11e1de77802ba21e160e77944e49 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -2,8 +2,25 @@
 # vi: set ft=ruby :\r
 \r
 Vagrant.configure(2) do |config|\r
+  # You can only have one config.vm.box uncommented at a time\r
+\r
+  # Comment this and uncomment another if you don't want to use the minimal Arch box\r
   config.vm.box = "dragon788/arch-ala-elasticdog"\r
 \r
+  # VMware/Virtualbox 64 bit\r
+  # config.vm.box = "phusion/ubuntu-14.04-amd64"\r
+  #\r
+  # VMware/Virtualbox 64 bit\r
+  # config.vm.box = "puphpet/centos65-x64"\r
+  #\r
+  # VMware/Virtualbox 64 bit\r
+  # config.vm.box = "bento/opensuse-13.2-x86_64"\r
+  #\r
+  # Virtualbox only\r
+  # config.vm.box = "bento/opensuse-13.2-i386"\r
+  # config.vm.box = ""\r
+  # config.vm.box = ""\r
+\r
   # This section allows you to customize the Virtualbox VM\r
   # settings, ie showing the GUI or upping the memory\r
   # or cores if desired\r
@@ -21,25 +38,32 @@ Vagrant.configure(2) do |config|
   config.vm.provider "vmware" do |vmw|\r
     # Hide the VMware GUI when booting the machine\r
     vmw.gui = false\r
-  \r
+ \r
     # Customize the amount of memory on the VM:\r
     vmw.memory = "512"\r
   end\r
 \r
-  # This ensures the system always gets the latest updates when powered on\r
+  # This script ensures the required packages for AVR programming are installed\r
+  # It also ensures the system always gets the latest updates when powered on\r
   # If this causes issues you can run a 'vagrant destroy' and then\r
-  # comment out these three lines and run 'vagrant up' to get a working\r
-  # non-updated box and then attempt to troubleshoot after it has started\r
-  #\r
-  config.vm.provision "shell", run: "always", inline: <<-SHELL\r
-    sudo pacman -Syu --needed --noconfirm\r
-  SHELL\r
+  # add a # before ,args: and run 'vagrant up' to get a working\r
+  # non-updated box and then attempt to troubleshoot or open a Github issue \r
   \r
-  # Allow user to speed up package installs using powerpill/wget tweaks\r
-  # Always run the pacman mirror update script if possible when vagrant comes up\r
-  # This will ensure that users never get stalled on a horribly slow mirror\r
+  config.vm.provision "shell", run: "always", path: "avr_setup.sh", args: "-update"\r
+\r
+  config.vm.post_up_message = """\r
+  Log into the VM using 'vagrant ssh' on OSX or from Git Bash (Win)\r
+  or 'vagrant ssh-config' and Putty or another SSH tool\r
 \r
-  config.vm.provision "shell", path: "avr_setup.sh"\r
+  Change directory to the keyboard you wish to program \r
+  optionally and modify your layout, \r
+  then run 'make clean' \r
+  and then 'make' to compile the .eep and .hex files.\r
+\r
+  Or you can copy and paste the line below. \r
+ \r
+  cd /vagrant; cd keyboard; cd ergodox_ez; make clean; make\r
+  \r
 \r
-  config.vm.post_up_message = """Change directory to the keyboard you wish to program and modify your layout, then run 'make clean' and 'make' to compile the .eep and .hex files."""\r
+  """\r
 end\r

diff --git a/avr_setup.sh b/avr_setup.sh
index ff4153ba37a572b60623834625a835c837fdd5dc..cd7412d748478d0e1ca7d00c4a8fb91eaa76b281 100644 (file)
--- a/avr_setup.sh
+++ b/avr_setup.sh
@@ -6,18 +6,26 @@
 
 if [[ -n "$(type -P pacman )" ]]; then
   # Arch linux and derivatives like Apricity
-  pacman -S --needed --noconfirm base-devel avr-gcc avr-binutils avr-libc dfu-utils
+  # Future improvements:
+  # Allow user to speed up package installs using powerpill/wget tweaks
+  # 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
 
 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
   
 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
 
 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
 
 fi