Split into multiple files

much more modular, also adds support for PRESTOW and POSTSTOW files

bootstrap.sh

@@ -1,53 +1,13 @@
 #!/bin/bash
 
-firstRun=0
-[ "$1" == "-f" ] && firstRun=1
-
-cd ~
-if [ ! -d ".dotfiles" ]
-then
 git clone http://adamgoldsmith.name/cgit/bootstrap.git .dotfiles
-	firstRun=1
-else
-	echo "~/.dotfiles already exists, not cloning"
-fi
-
 cd .dotfiles
-if [ $firstRun -eq 1 ]
-then
 git remote set-url origin http://adamgoldsmith.name/cgit/bootstrap.git
 git remote set-url --push origin ssh://adamgoldsmith.name:443/srv/git/bootstrap.git
-else
-	echo "Updating .dotfiles"
-	git pull
-fi
 
-echo "Getting emacs, zsh, and git"
+targets="$@"
-for i in emacs zsh git
+if [ -n "$targets" ]
-do
-	git clone "http://adamgoldsmith.name/cgit/dotfiles/$i.git"
-	cd $i
-	git remote set-url origin http://adamgoldsmith.name/cgit/dotfiles/$i.git
-	git remote set-url --push origin ssh://adamgoldsmith.name:443/srv/git/dotfiles/$i.git
-	cd ..
-done
-
-echo "getting prezto"
-cd zsh
-git submodule init
-git submodule update
-
-echo "Updating .dotfiles/zsh/.zprezto"
-cd .zprezto
-if [ $firstRun -eq 1 ]
 then
-	git remote set-url origin http://adamgoldsmith.name/cgit/prezto.git
+	./getter.sh "$@"
-	git remote set-url --push origin ssh://adamgoldsmith.name:443/srv/git/prezto.git
+	./stower.sh "$@"
-	git remote add upstream https://github.com/sorin-ionescu/prezto.git
 fi
-git submodule init
-git submodule update
-
-echo "Stowing emacs, zsh, and git"
-cd ~/.dotfiles/
-stow emacs zsh git

getter.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+targets="$@"
+for t in $targets
+do
+	if [ -d "$t" ]
+	then
+		echo "$t already exists, not getting"
+	else
+		echo "Getting $t"
+		git clone "http://adamgoldsmith.name/cgit/dotfiles/$t.git"
+		cd $t
+		git remote set-url origin http://adamgoldsmith.name/cgit/dotfiles/$t.git
+		git remote set-url --push origin ssh://adamgoldsmith.name:443/srv/git/dotfiles/$t.git
+		cd ..
+	fi
+done

stower.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+targets="$@"
+for t in $targets
+do
+	if [ -d "$t" ]
+	then
+		echo "Stowing $t"
+		if [ -e "$t/PRESTOW" ]
+		then
+			echo "Running $t/PRESTOW"
+			"$t/PRESTOW"
+		fi
+
+		stow -t"$HOME" --ignore="^PRESTOW$" --ignore="^POSTSTOW$" "$t"
+
+		if [ -e "$t/POSTSTOW" ]
+		then
+			echo "Running $t/POSTSTOW"
+			"$t/POSTSTOW"
+		fi
+	else
+		echo "target $t does not exist or is not a directory"
+		exit
+	fi
+done