Update move in scripts

4 files changed, 53 insertions, 16 deletions

diff --git a/common_move_in.sh b/common_move_in.sh
index 26eb153..1a441b6 100755
--- a/common_move_in.sh
+++ b/common_move_in.sh
@@ -12,39 +12,29 @@ if ! [ -d "$HOME/Code" ]; then
     mkdir $HOME/Code
 fi
 
-cd ~/Code
-
-if ! [ -d "$HOME/Code/dotfiles" ]; then
-    git clone git@codesaloon.com:jason/dotfiles.git
+if ! [ -d "$HOME/dotfiles" ]; then
+    git clone git@beehive.io:jason/dotfiles.git
     cd dotfiles
 else
     cd dotfiles
     git pull
 fi
-CWD=`pwd`
-
-if ! [ -e "$HOME/bin"]; then
-    mkdir $HOME/bin/
-    cd $HOME/bin/
-    curl -O http://orgmode.org/worg/code/awk/ical2org.awk
-fi
 
 if ! [ -e "$HOME/.vimrc" ]; then
     echo "Linking vim settings..."
-    ln -s $CWD/vim $HOME/.vim
-    ln -s $CWD/vim/vimrc $HOME/.vimrc
+    stow vim
 fi
 
 if ! [ -e "$HOME/.zshrc" ]; then
     echo "Linking .zshrc..."
-    ln -s $CWD/zshrc $HOME/.zshrc
+    stow zsh
 fi
 
 # OS X Only setup
 if [[ $OSTYPE == darwin* ]]; then
     if ! [ -e "$HOME/.amethyst" ]; then
         echo "Linking amethyst config..."
-        ln -s $CWD/amethyst $HOME/.amethyst
+        stow amethyst
     fi
 
     if [ -e "/usr/bin/vagrant" ] && [ -e "$CWD/../vagrant-vmware-license.lic" ]; then
@@ -54,4 +44,12 @@ if [[ $OSTYPE == darwin* ]]; then
     fi
 fi
 
+CWD=`pwd`
+
+if ! [ -e "$HOME/bin"]; then
+    mkdir $HOME/bin/
+    cd $HOME/bin/
+    curl -O http://orgmode.org/worg/code/awk/ical2org.awk
+fi
+
 echo "Done."
diff --git a/move_in.sh b/move_in.sh
new file mode 100755
index 0000000..453208b
--- /dev/null
+++ b/move_in.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+CURL='curl --silent --insecure --location'
+
+if [[ $OSTYPE == darwin* ]]; then
+    echo "OS X detected. Executing os-x_move_in.sh"
+    $CURL https://beehive.io/jason/dotfiles/raw/master/os-x_move_in.sh
+fi
+
+if [[ $OSTYPE == linux-gnu ]]; then
+    if [[ `lsb_release -i -s` == Ubuntu ]]; then
+        echo "Ubuntu detected. Executing ubuntu_move_in.sh"
+        $CURL https://beehive.io/jason/dotfiles/raw/master/ubuntu_move_in.sh | sh
+    fi
+fi
diff --git a/os-x_move_in.sh b/os-x_move_in.sh
index 8b16c6a..464ed0c 100755
--- a/os-x_move_in.sh
+++ b/os-x_move_in.sh
@@ -84,6 +84,16 @@ if ! [ -d '/Applications/LastPass.app' ]; then
     read -p "Press [Enter] key to continue..."
 fi
 
+cd $HOME
+
+if ! [ -d "$HOME/dotfiles" ]; then
+    git clone git@beehive.io:jason/dotfiles.git
+    cd dotfiles
+else
+    cd dotfiles
+    git pull
+fi
+
 ./common_move_in.sh
 
 open "/opt/homebrew-cask/Caskroom/little-snitch/3.5.1/Little Snitch Installer.app"
diff --git a/ubuntu_move_in.sh b/ubuntu_move_in.sh
index df234e4..3c18ed9 100644
--- a/ubuntu_move_in.sh
+++ b/ubuntu_move_in.sh
@@ -1,3 +1,17 @@
+echo "Updaing and dist-upgrading"
 sudo apt-get update && sudo apt-get -y dist-upgrade
 
-sudo apt-get install -y git i3
+echo "Installing some utilities"
+sudo apt-get install -y git stow
+
+cd $HOME
+
+if ! [ -d "$HOME/dotfiles" ]; then
+    echo "Dotfiles not found... cloning"
+    git clone git@beehive.io:jason/dotfiles.git
+    cd dotfiles
+else
+    echo "Dotfiles found... updating"
+    cd dotfiles
+    git pull
+fi