Author: Kyle Fuller <kyle@fuller.li> 2017-10-18 01:36:31 +0200 +0200
Committer: Kyle Fuller <kyle@fuller.li> 2017-10-18 01:37:14 +0200 +0200
Commit: 789684fd11ca1b57bd7c0e78a80293ef1d1ae751
Parent: a2e050c0b0266d2e7883322090fa543405587515
refactor: Use swiftenv from homebrew
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 707249523cd9ecc34598c93c4f6fbca12d2b4cef..07567f3a38e41c9d806bba547f35a0a86e061eef 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -11,8 +11,6 @@ alias home="git --work-tree=$HOME --git-dir=$HOME/.files.git"
# swiftenv
if test -d "$HOME/.swiftenv"
- setenv SWIFTENV_ROOT "$HOME/.swiftenv"
- setenv PATH "$SWIFTENV_ROOT/bin" $PATH
status --is-interactive; and . (swiftenv init -|psub)
end
diff --git a/Brewfile b/Brewfile
index a4f2e5e72f53131ed94afe903ffff7da48749970..979bab3a3d2fb971ad9a3b2b3e24132e080e3ddd 100644
--- a/Brewfile
+++ b/Brewfile
@@ -16,6 +16,7 @@ brew 'hub'
brew 'mas'
brew 'node'
brew 'pyenv'
+brew 'swiftenv'
brew 'tmux'
brew 'tree'
brew 'vim'
diff --git a/Makefile b/Makefile
index b4c1f97bfdbe13b6d3aba88fa518972478c34fc1..21e2489f8f71d938e3945d58f61891d6d89163d6 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ BREW_BUNDLE=/usr/local/Homebrew/Library/Taps/homebrew/homebrew-bundle
OS := $(shell uname)
-all: $(OS) .swiftenv vim-packages fish-packages
+all: $(OS) vim-packages fish-packages
Darwin: homebrew-packages python-packages
@@ -32,9 +32,6 @@ $(PIP) install virtualenv
/usr/local/bin/rfc:
$(PIP) install rfc
-
-.swiftenv:
- git clone https://github.com/kylef/swiftenv .swiftenv
fish:
@chsh -s $(shell which fish)