diff --git a/bootstrap.sh b/bootstrap.sh index abe1aeeb2..5f3e47f6f 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -2,11 +2,8 @@ cd "$(dirname "${BASH_SOURCE}")"; -git pull origin master; - function doIt() { - rsync --exclude ".git/" --exclude ".DS_Store" --exclude "bootstrap.sh" \ - --exclude "README.md" --exclude "LICENSE" -avh --no-perms . ~; + rsync --exclude ".DS_Store" -avh --no-perms files ~; source ~/.bash_profile; } diff --git a/.aliases b/files/.aliases similarity index 100% rename from .aliases rename to files/.aliases diff --git a/.aws/config b/files/.aws/config similarity index 100% rename from .aws/config rename to files/.aws/config diff --git a/.aws/credentials b/files/.aws/credentials similarity index 100% rename from .aws/credentials rename to files/.aws/credentials diff --git a/.bash_profile b/files/.bash_profile similarity index 100% rename from .bash_profile rename to files/.bash_profile diff --git a/.bash_prompt b/files/.bash_prompt similarity index 100% rename from .bash_prompt rename to files/.bash_prompt diff --git a/.bashrc b/files/.bashrc similarity index 100% rename from .bashrc rename to files/.bashrc diff --git a/.curlrc b/files/.curlrc similarity index 100% rename from .curlrc rename to files/.curlrc diff --git a/.editorconfig b/files/.editorconfig similarity index 100% rename from .editorconfig rename to files/.editorconfig diff --git a/.exports b/files/.exports similarity index 100% rename from .exports rename to files/.exports diff --git a/.functions b/files/.functions similarity index 100% rename from .functions rename to files/.functions diff --git a/.gdbinit b/files/.gdbinit similarity index 100% rename from .gdbinit rename to files/.gdbinit diff --git a/.gitattributes b/files/.gitattributes similarity index 100% rename from .gitattributes rename to files/.gitattributes diff --git a/.gitconfig b/files/.gitconfig similarity index 100% rename from .gitconfig rename to files/.gitconfig diff --git a/.gitignore b/files/.gitignore similarity index 100% rename from .gitignore rename to files/.gitignore diff --git a/.gvimrc b/files/.gvimrc similarity index 100% rename from .gvimrc rename to files/.gvimrc diff --git a/.hgignore b/files/.hgignore similarity index 100% rename from .hgignore rename to files/.hgignore diff --git a/.hushlogin b/files/.hushlogin similarity index 100% rename from .hushlogin rename to files/.hushlogin diff --git a/.inputrc b/files/.inputrc similarity index 100% rename from .inputrc rename to files/.inputrc diff --git a/.mrjob.conf b/files/.mrjob.conf similarity index 100% rename from .mrjob.conf rename to files/.mrjob.conf diff --git a/.s3cfg b/files/.s3cfg similarity index 100% rename from .s3cfg rename to files/.s3cfg diff --git a/.screenrc b/files/.screenrc similarity index 100% rename from .screenrc rename to files/.screenrc diff --git a/.vim/backups/.gitignore b/files/.vim/backups/.gitignore similarity index 100% rename from .vim/backups/.gitignore rename to files/.vim/backups/.gitignore diff --git a/.vim/colors/solarized.vim b/files/.vim/colors/solarized.vim similarity index 100% rename from .vim/colors/solarized.vim rename to files/.vim/colors/solarized.vim diff --git a/.vim/swaps/.gitignore b/files/.vim/swaps/.gitignore similarity index 100% rename from .vim/swaps/.gitignore rename to files/.vim/swaps/.gitignore diff --git a/.vim/syntax/json.vim b/files/.vim/syntax/json.vim similarity index 100% rename from .vim/syntax/json.vim rename to files/.vim/syntax/json.vim diff --git a/.vim/undo/.gitignore b/files/.vim/undo/.gitignore similarity index 100% rename from .vim/undo/.gitignore rename to files/.vim/undo/.gitignore diff --git a/.vimrc b/files/.vimrc similarity index 100% rename from .vimrc rename to files/.vimrc diff --git a/.wgetrc b/files/.wgetrc similarity index 100% rename from .wgetrc rename to files/.wgetrc diff --git a/bin/bash b/files/bin/bash similarity index 100% rename from bin/bash rename to files/bin/bash diff --git a/bin/httpcompression b/files/bin/httpcompression similarity index 100% rename from bin/httpcompression rename to files/bin/httpcompression diff --git a/bin/subl b/files/bin/subl similarity index 100% rename from bin/subl rename to files/bin/subl diff --git a/init/Preferences.sublime-settings b/files/init/Preferences.sublime-settings similarity index 100% rename from init/Preferences.sublime-settings rename to files/init/Preferences.sublime-settings diff --git a/init/Solarized Dark xterm-256color.terminal b/files/init/Solarized Dark xterm-256color.terminal similarity index 100% rename from init/Solarized Dark xterm-256color.terminal rename to files/init/Solarized Dark xterm-256color.terminal diff --git a/init/Solarized Dark.itermcolors b/files/init/Solarized Dark.itermcolors similarity index 100% rename from init/Solarized Dark.itermcolors rename to files/init/Solarized Dark.itermcolors diff --git a/init/profile_default/startup/README b/files/init/profile_default/startup/README similarity index 100% rename from init/profile_default/startup/README rename to files/init/profile_default/startup/README diff --git a/init/profile_default/static/custom/custom.css b/files/init/profile_default/static/custom/custom.css similarity index 100% rename from init/profile_default/static/custom/custom.css rename to files/init/profile_default/static/custom/custom.css diff --git a/init/profile_default/static/custom/custom.js b/files/init/profile_default/static/custom/custom.js similarity index 100% rename from init/profile_default/static/custom/custom.js rename to files/init/profile_default/static/custom/custom.js diff --git a/init/profile_pyspark/history.sqlite b/files/init/profile_pyspark/history.sqlite similarity index 100% rename from init/profile_pyspark/history.sqlite rename to files/init/profile_pyspark/history.sqlite diff --git a/init/profile_pyspark/ipython_config.py b/files/init/profile_pyspark/ipython_config.py similarity index 100% rename from init/profile_pyspark/ipython_config.py rename to files/init/profile_pyspark/ipython_config.py diff --git a/init/profile_pyspark/ipython_nbconvert_config.py b/files/init/profile_pyspark/ipython_nbconvert_config.py similarity index 100% rename from init/profile_pyspark/ipython_nbconvert_config.py rename to files/init/profile_pyspark/ipython_nbconvert_config.py diff --git a/init/profile_pyspark/ipython_notebook_config.py b/files/init/profile_pyspark/ipython_notebook_config.py similarity index 100% rename from init/profile_pyspark/ipython_notebook_config.py rename to files/init/profile_pyspark/ipython_notebook_config.py diff --git a/init/profile_pyspark/ipython_qtconsole_config.py b/files/init/profile_pyspark/ipython_qtconsole_config.py similarity index 100% rename from init/profile_pyspark/ipython_qtconsole_config.py rename to files/init/profile_pyspark/ipython_qtconsole_config.py diff --git a/init/profile_pyspark/startup/00-pyspark-setup.py b/files/init/profile_pyspark/startup/00-pyspark-setup.py similarity index 100% rename from init/profile_pyspark/startup/00-pyspark-setup.py rename to files/init/profile_pyspark/startup/00-pyspark-setup.py diff --git a/init/profile_pyspark/startup/README b/files/init/profile_pyspark/startup/README similarity index 100% rename from init/profile_pyspark/startup/README rename to files/init/profile_pyspark/startup/README diff --git a/init/profile_pyspark/static/custom/custom.css b/files/init/profile_pyspark/static/custom/custom.css similarity index 100% rename from init/profile_pyspark/static/custom/custom.css rename to files/init/profile_pyspark/static/custom/custom.css diff --git a/init/profile_pyspark/static/custom/custom.js b/files/init/profile_pyspark/static/custom/custom.js similarity index 100% rename from init/profile_pyspark/static/custom/custom.js rename to files/init/profile_pyspark/static/custom/custom.js diff --git a/.dots b/setup.sh similarity index 96% rename from .dots rename to setup.sh index 80966acc0..6bf3a91d7 100755 --- a/.dots +++ b/setup.sh @@ -16,7 +16,7 @@ function runDots() { echo "Syncing the dev-setup repo to your local machine." echo "------------------------------" echo "" - cd ~ && curl -#L https://github.com/donnemartin/dev-setup/tarball/master | tar -xzv --strip-components 1 --exclude={README.md,LICENSE} + ./bootstrap.sh fi if [ $ARG == "osxprep" ] || [ $ARG == "all" ]; then # Run the osxprep.sh Script