Source functions -after- we install dotfiles
This commit is contained in:
parent
789242d31d
commit
c149447e48
19
deploy
19
deploy
|
@ -3,30 +3,31 @@
|
||||||
GREEN=$(tput setaf 2)
|
GREEN=$(tput setaf 2)
|
||||||
RS=$(tput sgr0)
|
RS=$(tput sgr0)
|
||||||
src=$(dirname "$BASH_SOURCE")
|
src=$(dirname "$BASH_SOURCE")
|
||||||
|
INSTALL_DIR="~/.dotfiles"
|
||||||
source $src/zsh/functions
|
|
||||||
|
|
||||||
##### GIT & DOTFILES ######
|
##### GIT & DOTFILES ######
|
||||||
# If the install folder doesn't exist, you bash < <(curl ...)'d this script!
|
# If the install folder doesn't exist, you bash < <(curl ...)'d this script!
|
||||||
if [ ! -d $src/install ]; then
|
if [ ! -d $src/install ]; then
|
||||||
# Check for git and install it if necessary
|
# Check for git and install it if necessary
|
||||||
if ! command_exists git; then
|
if ! command_exists git; then
|
||||||
echo-r "==> GIT isn't installed!"
|
echo "==> GIT isn't installed!"
|
||||||
echo-g "==> Installing GIT"
|
echo "==> Installing GIT"
|
||||||
pkg-install git
|
pkg-install git
|
||||||
|
|
||||||
do_link $src/gitconfig ~/.gitconfig
|
|
||||||
do_link $src/gitignore ~/.gitignore
|
|
||||||
|
|
||||||
# https://github.com/jamiew/git-friendly
|
# https://github.com/jamiew/git-friendly
|
||||||
bash < <(curl https://raw.github.com/jamiew/git-friendly/master/install.sh)
|
bash < <(curl https://raw.github.com/jamiew/git-friendly/master/install.sh)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Get the dotfiles
|
# Get the dotfiles
|
||||||
echo-g "==> Cloning dotfiles repo"
|
echo "==> Cloning dotfiles repo"
|
||||||
git clone https://github.com/hlissner/dotfiles.git ~/.dotfiles
|
git clone https://github.com/hlissner/dotfiles.git "$INSTALL_DIR"
|
||||||
|
|
||||||
|
do_link "$INSTALL_DIR/gitconfig" ~/.gitconfig
|
||||||
|
do_link "$INSTALL_DIR/gitignore" ~/.gitignore
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
source "$INSTALL_DIR/zsh/functions"
|
||||||
|
|
||||||
###### DEPENDENCIES #######
|
###### DEPENDENCIES #######
|
||||||
if is_mac; then
|
if is_mac; then
|
||||||
# Set up the OSX options
|
# Set up the OSX options
|
||||||
|
|
Loading…
Reference in a new issue