diff --git a/README.md b/README.md index a829f44..d78e6f7 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ useless. ## Stupid simple installation one-liner ```shell -source <(curl -s https://raw.githubusercontent.com/joshtronic/dotfiles/master/setup) +source <(curl -s https://raw.githubusercontent.com/joshtronic/dotfiles/master/install) ``` ![LeePaceCelebrate](http://i.giphy.com/Vc5x1pG5RFH3O.gif) diff --git a/install b/install index c467128..00bd76f 100755 --- a/install +++ b/install @@ -6,4 +6,8 @@ DOTFILES_DIR=~/.dotfiles rm -rf $DOTFILES_DIR mkdir $DOTFILES_DIR git clone $DOTFILES_REPO $DOTFILES_DIR -make -C $DOTFILES +cd $DOTFILES_DIR +git pull origin master +git submodule update --init --recursive +make + diff --git a/setup b/setup index 241763c..a67933f 100755 --- a/setup +++ b/setup @@ -31,19 +31,6 @@ PIP=( "psutil" ) -# Checks if the directory exists -if [ ! -d "$DOTFILES_DIR" ]; then - mkdir $DOTFILES_DIR - git clone $DOTFILES_REPO $DOTFILES_DIR -fi - -# TODO Check if the directory contains our configured repo - -# Gets the latest code -cd $DOTFILES_DIR -git pull origin master -git submodule update --init --recursive - # Creates our symlinks for SYMLINK in "${SYMLINKS[@]}"; do # TODO Check if the file exists and whether or not it's a symlink