Update move in scripts, add bin scripts

1 files changed, 15 insertions, 27 deletions

diff --git a/common_move_in.sh b/common_move_in.sh
index 1a441b6..ee431ee 100755
--- a/common_move_in.sh
+++ b/common_move_in.sh
@@ -1,25 +1,24 @@
 #!/bin/bash
+cd $HOME/dotfiles/
+
+if ! [ -d "$HOME/.git" ]; then
+    echo "Linking git settings..."
+    stow git
+fi
 
 if ! [ -d "$HOME/.oh-my-zsh" ]; then
     echo "Installing Oh My ZSH"
-    curl -L http://install.ohmyz.sh | sh
+    curl --location http://install.ohmyz.sh | sh
 
     # Remove the default config in favor of our own later on in this script
     rm $HOME/.zshrc
+    chsh -s `which zsh`
 fi
 
 if ! [ -d "$HOME/Code" ]; then
     mkdir $HOME/Code
 fi
 
-if ! [ -d "$HOME/dotfiles" ]; then
-    git clone git@beehive.io:jason/dotfiles.git
-    cd dotfiles
-else
-    cd dotfiles
-    git pull
-fi
-
 if ! [ -e "$HOME/.vimrc" ]; then
     echo "Linking vim settings..."
     stow vim
@@ -30,26 +29,15 @@ if ! [ -e "$HOME/.zshrc" ]; then
     stow zsh
 fi
 
-# OS X Only setup
-if [[ $OSTYPE == darwin* ]]; then
-    if ! [ -e "$HOME/.amethyst" ]; then
-        echo "Linking amethyst config..."
-        stow amethyst
-    fi
-
-    if [ -e "/usr/bin/vagrant" ] && [ -e "$CWD/../vagrant-vmware-license.lic" ]; then
-        echo "Installing Vagrant support for VMWare Fusion..."
-        vagrant plugin install vagrant-vmware-fusion
-        vagrant plugin license vagrant-vmware-fusion "$CWD/../vagrant-vmware-license.lic"
-    fi
-fi
-
-CWD=`pwd`
-
-if ! [ -e "$HOME/bin"]; then
+if ! [ -e "$HOME/bin" ]; then
     mkdir $HOME/bin/
     cd $HOME/bin/
     curl -O http://orgmode.org/worg/code/awk/ical2org.awk
 fi
 
-echo "Done."
+if ! [ -e "$HOME/.ssh" ]; then
+    mkdir $HOME/.ssh/
+fi
+if ! [ -e "$HOME/.ssh/id_rsa" ]; then
+    ssh-keygen -t rsa -b 4096
+fi