diff --git a/homebrew/path.zsh b/homebrew/path.zsh new file mode 100755 index 000000000..5928c9cab --- /dev/null +++ b/homebrew/path.zsh @@ -0,0 +1,6 @@ +#!/bin/sh +if [ -d "$HOME/.linuxbrew/bin" ]; then + export PATH="$HOME/.linuxbrew/bin:$PATH" + export MANPATH="$HOME/.linuxbrew/share/man:$MANPATH" + export INFOPATH="$HOME/.linuxbrew/share/info:$INFOPATH" +fi diff --git a/osx/install.sh b/osx/install.sh index 77166f7db..13698f012 100755 --- a/osx/install.sh +++ b/osx/install.sh @@ -1,3 +1,4 @@ #!/bin/sh +[ "$(uname -s)" != "Darwin" ] && exit 0 echo "› sudo softwareupdate -ia" sudo softwareupdate -ia diff --git a/script/install b/script/install index 1388f5f64..3b5ca5110 100755 --- a/script/install +++ b/script/install @@ -5,13 +5,14 @@ set -e cd "$(dirname "$0")"/.. -# Run Homebrew through the Brewfile -echo "› brew bundle" -brew bundle - # find the installers and run them iteratively find . -name install.sh | egrep -v "homebrew|build" | while read installer do echo "› ${installer}..." sh -c "$installer" done + +# Run Homebrew through the Brewfile +echo "› brew bundle" +brew bundle + diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink index 2e8bedce9..6d27f7745 100644 --- a/zsh/zshrc.symlink +++ b/zsh/zshrc.symlink @@ -1,15 +1,16 @@ #!/bin/zsh # shortcut to this dotfiles path is $ZSH -export ZSH=$HOME/.dotfiles +export ZSH="$HOME/.dotfiles" # your project folder that we can `c [tab]` to -export PROJECTS=~/Code +export PROJECTS="$HOME/Code" # all of our zsh files typeset -U config_files config_files=($ZSH/*/*.zsh) # load the path files +source "$ZSH/homebrew/path.zsh" for file in ${(M)config_files:#*/path.zsh}; do source "$file" done