Merge branch 'master' of ssh://adamgoldsmith.name:443/srv/git/dotfiles

bootstrap.sh

@@ -1,14 +1,22 @@
 #!/bin/bash
 
+firstRun=0
+[ "$1" == "-f" ] && firstRun=1
+
 cd ~
 if [ ! -d ".dotfiles" ]
 then
 	git clone http://adamgoldsmith.name/cgit/dotfiles.git .dotfiles
+	firstRun=1
 else
 	echo "~/.dotfiles already exists, not cloning"
 fi
 
 echo "Updating .dotfiles"
+if [ $firstRun -eq 1 ]
+then
+	git remote set-url --push origin ssh://adamgoldsmith.name:443/srv/git/dotfiles.git
+fi
 cd .dotfiles
 git pull
 git submodule init
@@ -16,6 +24,11 @@ git submodule update
 
 echo "Updating .dotfiles/zsh/.zprezto"
 cd zsh/.zprezto/
+if [ $firstRun -eq 1 ]
+then
+	git remote set-url --push origin ssh://adamgoldsmith.name:443/srv/git/prezto.git
+	git remote add upstream https://github.com/sorin-ionescu/prezto.git
+fi
 git submodule init
 git submodule update