Updated submodule pointers made tweaks to bootstrapping.

This commit is contained in:
Ivan Malison 2013-03-17 23:46:42 +01:00
parent 948a35b3f0
commit d3277498c1
5 changed files with 43 additions and 13 deletions

View File

@ -75,6 +75,3 @@
pushInsteadOf = "git://gist.github.com/" pushInsteadOf = "git://gist.github.com/"
[url "git://gist.github.com/"] [url "git://gist.github.com/"]
insteadOf = "gist:" insteadOf = "gist:"
[push]
default = simple

32
.zshrc Normal file
View File

@ -0,0 +1,32 @@
# Path to your oh-my-zsh configuration.
ZSH=$HOME/.oh-my-zsh
# Customize to your needs...
for file in ~/.{path,bash_prompt,exports,shared_exports,aliases,functions,extra}; do
[ -r "$file" ] && source "$file"
done
# Set name of the theme to load.
# Look in ~/.oh-my-zsh/themes/
# Optionally, if you set this to "random", it'll load a random theme each
# time that oh-my-zsh is loaded.
ZSH_THEME="fino"
# Example aliases
# alias zshconfig="mate ~/.zshrc"
# alias ohmyzsh="mate ~/.oh-my-zsh"
# Set to this to use case-sensitive completion
# CASE_SENSITIVE="true"
# Comment this out to disable bi-weekly auto-update checks
# DISABLE_AUTO_UPDATE="true"
# Uncomment to change how many often would you like to wait before auto-updates occur? (in days)
# export UPDATE_ZSH_DAYS=13
plugins=(git github heroku)
source $ZSH/oh-my-zsh.sh
unset file

View File

@ -2,16 +2,16 @@
cd "$(dirname "${BASH_SOURCE}")" cd "$(dirname "${BASH_SOURCE}")"
git pull git pull
function doIt() { function doIt() {
rsync --exclude "tmux-powerline" --exclude ".git/" --exclude ".DS_Store" --exclude "bootstrap.sh" --exclude "README.md" -av . ~ rsync --exclude "oh-my-zsh" --exclude "tmux-powerline" --exclude ".git/" --exclude ".DS_Store" --exclude "bootstrap.sh" --exclude "README.md" --exclude "setup.sh" -av . ~
} }
if [ "$1" == "--force" -o "$1" == "-f" ]; then if [ "$1" == "--force" -o "$1" == "-f" ]; then
doIt doIt
else else
read -p "This may overwrite existing files in your home directory. Are you sure? (y/n) " -n 1 read -p "This may overwrite existing files in your home directory. Are you sure? (y/n) " -n 1
echo echo
if [[ $REPLY =~ ^[Yy]$ ]]; then if [[ $REPLY =~ ^[Yy]$ ]]; then
doIt doIt
fi fi
fi fi
unset doIt unset doIt
source ~/.bash_profile source ~/.bash_profile

@ -1 +1 @@
Subproject commit e75662a030aa9ba8378b5557719df38e2e570d44 Subproject commit 77c07793bd941101ad375e1fe9f16e075850465f

View File

@ -1,6 +1,7 @@
#!/bin/bash #!/bin/bash
# Go to the source directory of this script.
cd "$(dirname "${BASH_SOURCE}")" cd "$(dirname "${BASH_SOURCE}")"
sudo -v
source bootstrap.sh source bootstrap.sh
case `uname` in case `uname` in