Merge branch 'master' of github.com:staticsafe/dotfiles

This commit is contained in:
staticsafe 2012-01-28 20:50:48 -05:00
commit 10210235ea
2 changed files with 7 additions and 2 deletions

1
.vimrc
View File

@ -16,3 +16,4 @@ set shiftwidth=4
set softtabstop=4 set softtabstop=4
set autoindent set autoindent
set mouse=a set mouse=a
set hls is

View File

@ -13,6 +13,7 @@ vimrcurl = "https://raw.github.com/staticsafe/dotfiles/master/.vimrc"
zshrcurl = "https://raw.github.com/staticsafe/dotfiles/master/.zshrc" zshrcurl = "https://raw.github.com/staticsafe/dotfiles/master/.zshrc"
tmuxurl = "https://raw.github.com/staticsafe/dotfiles/master/.tmux.conf" tmuxurl = "https://raw.github.com/staticsafe/dotfiles/master/.tmux.conf"
vimdirurl = "http://dl.dropbox.com/u/2888062/vimdir.tar.bz2" vimdirurl = "http://dl.dropbox.com/u/2888062/vimdir.tar.bz2"
envupdate = "https://raw.github.com/staticsafe/dotfiles/master/envupdate.sh"
def sudocheck(): def sudocheck():
#sudocheck #sudocheck
@ -84,7 +85,10 @@ def checksandactions():
print "Setting default shell for this user to zsh! Log out and log back in to see changes." print "Setting default shell for this user to zsh! Log out and log back in to see changes."
setzsh = call("chsh -s $(which zsh)", shell = True) setzsh = call("chsh -s $(which zsh)", shell = True)
zshhistory = call("touch ~/.zhistory", shell = True) zshhistory = call("touch ~/.zhistory", shell = True)
#Downloads environment update script
urldownload(confurl = envupdate)
scriptperm = call("chmod a+x envupdate.sh", shell = True)
def envArch(): def envArch():
sudocheck() sudocheck()
#Install relevant packages #Install relevant packages
@ -136,4 +140,4 @@ def main():
raise SystemExit raise SystemExit
if __name__ == "__main__": if __name__ == "__main__":
main() main()