Author: Kyle Fuller <kyle@fuller.li> 2016-09-24 22:50:05 +0100 +0100
Committer: Kyle Fuller <kyle@fuller.li> 2016-09-24 22:50:05 +0100 +0100
Commit: bb4d41b526834b6dd31e144885ca1d64dcd1644b
Parent: d3cac1d109e97a297e24c4f3a8fbb6a4475b4dd4
[brew] Update to 1.0
diff --git a/Brewfile b/Brewfile
index 1cedd29f408029f96a63b2f885ad4da3e5ffb617..8f029afc9d83ad25643253d1b5f2cfbdd1dc10bb 100644
--- a/Brewfile
+++ b/Brewfile
@@ -3,7 +3,6 @@ tap 'homebrew/bundle'
brew 'aspell'
brew 'awscli'
-brew 'caskroom/cask/brew-cask'
brew 'cloc'
brew 'fish'
brew 'fzf'
diff --git a/Makefile b/Makefile
index e00487d7d7ba70c6390999833d075b09bf7404fd..b63cd28c666cab89fc141afb686da89541b79088 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,20 @@
PIP=PIP_REQUIRE_VIRTUALENV=false pip
+BREW=/usr/local/bin/brew
+BREW_BUNDLE=/usr/local/Homebrew/Library/Taps/homebrew/homebrew-bundle
+
all: .swiftenv
osx: homebrew-packages python-packages all
-/usr/local/bin/brew:
+$(BREW):
@echo Installing Homebrew
@ruby -e "`curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install`"
-/usr/local/Library/Taps/homebrew/homebrew-bundle: /usr/local/bin/brew
+$(BREW_BUNDLE): $(BREW)
brew tap Homebrew/bundle
.PHONY: homebrew-packages
-homebrew-packages: /usr/local/Library/Taps/homebrew/homebrew-bundle
+homebrew-packages: $(BREW_BUNDLE)
brew bundle
.PHONY: python-packages