From 4563a5a16dbc2f427c8a36815d8dc20ced005958 Mon Sep 17 00:00:00 2001 From: Mitch Tishmack Date: Wed, 17 Dec 2014 09:43:57 -0600 Subject: [PATCH] Try getting osx to work. --- .gitignore | 2 ++ Makefile | 9 +++++---- Vagrantfile | 37 ++++++++++++++++++++++++++++++------- 3 files changed, 37 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 3f93f93..e242da6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ .vagrant .checksum +common/.profile +git/.gitconfig diff --git a/Makefile b/Makefile index 87d66e5..cf2f0c4 100644 --- a/Makefile +++ b/Makefile @@ -13,9 +13,9 @@ PWD=$(shell pwd) .PHONY: common emacs git ruby haskell perl tmux vim zsh list home osx linux ws -home: gitconfig dotprofile - $(DOTDEE) ../$(DOTPRO) - $(DOTDEE) ../$(DOTGIT) +home: dotprofile + $(DOTDEE) $(PWD)/../$(DOTPRO) + ws: common emacs git ruby haskell perl tmux vim zsh home @@ -46,12 +46,13 @@ $(DOTPROFILE): $(DOTPROFILECKSUM): $(DOTPROFILE) $(DOTDEE) $(DOTPROFILE) -common: $(DOTFILECKSUM) +common: $(DOTPROFILECKSUM) $(STOW) $(STOWOPTS) common # Specific stows, nothing special git: gitconfig $(STOW) git + $(DOTDEE) $(PWD)/../$(DOTGIT) emacs: $(STOW) emacs # $@? diff --git a/Vagrantfile b/Vagrantfile index 29e8fc1..52c1ea1 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -3,10 +3,12 @@ ENV['VAGRANT_DOTFILE_PATH'] = "/tmp/vagrant" Vagrant.configure("2") do |config| - config.vm.box = "precise64" - config.vm.provision "shell", - privileged: false, - inline: "if [ ! -e /var/tmp/.done ]; then + config.vm.define "ubuntu1204" do |ubuntu1204| + ubuntu1204.vm.box = "precise64" + ubuntu1204.vm.synced_folder ".", "/home/vagrant/dotfiles" + ubuntu1204.vm.provision "shell", + privileged: false, + inline: "if [ ! -e /var/tmp/.done ]; then sudo apt-get clean sudo rm -fr /var/lib/apt/lists sudo apt-get update @@ -17,11 +19,32 @@ sudo apt-get update sudo apt-get install -y -q xstow python-pip git pax zsh sudo pip install update-dotdee sudo usermod -s /bin/zsh vagrant -mkdir /home/vagrant/dotfiles -sudo mount -o bind /vagrant /home/vagrant/dotfiles touch /var/tmp/.done fi cd ~/dotfiles -make ws all +make clean && make " + end + + # 10.{10,9} are the same basically + osx_cmd = "sudo xcodebuild -license accept +sudo xcode-select -s /Applications/Xcode.app +ruby -e \"$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)\" +export PATH=/usr/local/bin:${PATH} +brew install gcc xstow python +pip install update-dotdee +cd ~/dotfiles +make clean && make +" + config.vm.define "yosemite" do |yosemite| + yosemite.vm.box = "yosemite" + yosemite.vm.synced_folder ".", "/Users/vagrant/dotfiles" + yosemite.vm.provision "shell", privileged: false, inline: osx_cmd + end + + config.vm.define "mavericks" do |mavericks| + mavericks.vm.box = "mavericks" + mavericks.vm.synced_folder ".", "/Users/vagrant/dotfiles" + mavericks.vm.provision "shell", privileged: false, inline: osx_cmd + end end