Fix improper prefix

This commit is contained in:
Henrik Lissner 2013-03-22 16:31:54 -04:00
parent c149447e48
commit 7cbcace230

19
deploy
View file

@ -2,12 +2,11 @@
GREEN=$(tput setaf 2) GREEN=$(tput setaf 2)
RS=$(tput sgr0) RS=$(tput sgr0)
src=$(dirname "$BASH_SOURCE")
INSTALL_DIR="~/.dotfiles" INSTALL_DIR="~/.dotfiles"
##### 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 $INSTALL_DIR ]; 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 "==> GIT isn't installed!" echo "==> GIT isn't installed!"
@ -22,8 +21,8 @@ if [ ! -d $src/install ]; then
echo "==> Cloning dotfiles repo" echo "==> Cloning dotfiles repo"
git clone https://github.com/hlissner/dotfiles.git "$INSTALL_DIR" git clone https://github.com/hlissner/dotfiles.git "$INSTALL_DIR"
do_link "$INSTALL_DIR/gitconfig" ~/.gitconfig ln -sf "$INSTALL_DIR/gitconfig" ~/.gitconfig
do_link "$INSTALL_DIR/gitignore" ~/.gitignore ln -sf "$INSTALL_DIR/gitignore" ~/.gitignore
fi fi
source "$INSTALL_DIR/zsh/functions" source "$INSTALL_DIR/zsh/functions"
@ -31,7 +30,7 @@ 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
$src/install/osx $INSTALL_DIR/install/osx
# Detect homebrew; install it if necessary # Detect homebrew; install it if necessary
if ! command_exists brew; then if ! command_exists brew; then
@ -74,7 +73,7 @@ if is_mac; then
echo-r "==> Homebrew is already installed!" echo-r "==> Homebrew is already installed!"
fi fi
elif is_linux; then elif is_linux; then
ehco-g "==> Installing dependencies" echo-g "==> Installing dependencies"
pkg-install curl python ruby wget zsh pkg-install curl python ruby wget zsh
echo-g "==> Aptitude: Updating" echo-g "==> Aptitude: Updating"
@ -85,16 +84,16 @@ elif is_linux; then
fi fi
# Install & setup ZSH shell # Install & setup ZSH shell
$src/install/zsh $INSTALL_DIR/install/zsh
# Install RVM & setup 1.8.7, 1.9.2 rubies # Install RVM & setup 1.8.7, 1.9.2 rubies
$src/install/rvm $INSTALL_DIR/install/rvm
# Install & setup TMUX # Install & setup TMUX
$src/install/tmux $INSTALL_DIR/install/tmux
# Install & setup VIM # Install & setup VIM
$src/install/vim $INSTALL_DIR/install/vim
# Wrap things up # Wrap things up
echo echo