From 5cb8f338529afadfeb07ba2e7f11d06168c66843 Mon Sep 17 00:00:00 2001
From: Patrick McDonagh <pmcdonagh@henry-pump.com>
Date: Mon, 8 Aug 2016 13:28:03 -0500
Subject: [PATCH] Removes some unnecessary steps

---
 setup.sh | 49 ++++---------------------------------------------
 1 file changed, 4 insertions(+), 45 deletions(-)

diff --git a/setup.sh b/setup.sh
index 80be384..489f4e2 100644
--- a/setup.sh
+++ b/setup.sh
@@ -9,7 +9,6 @@ installLoc="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 echo $installLoc
 cd $installLoc/setup
 
-
 echo "Setting up SSH Key"
 mkdir ~/.ssh
 cat henryPumpDev.pub  >> ~/.ssh/authorized_keys
@@ -20,7 +19,7 @@ sudo mv hostname /etc/hostname
 echo "Setting up networking"
 sudo mv interfaces /etc/network/interfaces
 sudo apt-get update
-sudo apt-get -y install python-dev htop tmux sqlite3
+sudo apt-get -y install htop tmux sqlite3
 
 echo "Setting up USB Drive"
 sudo mkdir /mnt/usb
@@ -35,6 +34,7 @@ sudo chmod 777 /mnt/usb
 
 echo "Configuring MySQL to use the USB drive"
 sudo apt-get install mariadb-server mariadb-client -y
+mysql --user="root" --password="henrypump" --execute="source setupUsers.sql"
 cd /mnt/usb
 sudo mkdir mysql
 sudo cp -Rv /var/lib/mysql/* /mnt/usb/mysql/
@@ -45,33 +45,8 @@ sudo sed 's:/var/lib/mysql:/mnt/usb/mysql:g' /etc/mysql/my.cnf
 sudo service mysql restart
 
 
-# echo "Configuring MySQL"
-# sudo service mysql restart
-# mysql --user="root" --password="henrypump" --execute="source WellDataEmpty.sql"
-# mysql --user="root" --password="henrypump" --execute="source setupUsers.sql"
-
-
-# echo "installing TuxEip"
-# wget  https://github.com/leicht/TuxPLC/archive/master.zip
-# unzip master.zip
-# cd TuxPLC-master/tuxeip
-# cmake CMakeLists.txt
-# make
-#
-# cd lib
-# ar -x libtuxeip.a
-# gcc -shared *.o -o libtuxeip.so
-# sudo cp libtuxeip.so /usr/lib/
-
-
-cd $installLoc/setup
-#sudo wget -O /etc/apt/sources.list.d/repository.pi3g.com.list http://repository.pi3g.com/sources.list
-#wget -O - http://repository.pi3g.com/pubkey | sudo apt-key add -
-
-# echo "Configuring nginx"
-# sudo mv default /etc/nginx/sites-enabled/default
-
 echo "installing node"
+cd $installLoc/setup
 wget http://node-arm.herokuapp.com/node_latest_armhf.deb
 sudo dpkg -i node_latest_armhf.deb
 
@@ -82,28 +57,11 @@ sudo dpkg -i node_latest_armhf.deb
 
 sudo npm install -g coffee-script pm2 bower sails
 
-# echo "Configuring Auto-start scripts"
-# sudo chmod 777 loggers
-# sudo mv loggers /etc/init.d/
-# sudo update-rc.d loggers defaults
-
-# NO LONGER USING WEBSITE SINCE SWITCHING TO PM2
-# sudo chmod 777 website
-# sudo mv website /etc/init.d/
-# sudo update-rc.d website defaults
-
 echo "Installing pip - Python Package Manager"
 wget https://bootstrap.pypa.io/get-pip.py
 sudo python get-pip.py
 sudo pip install requests pycomm
 
-wget https://dev.mysql.com/get/Downloads/Connector-Python/mysql-connector-python_2.1.3-1debian7.9_all.deb
-sudo dpkg -i mysql-connector-python_2.1.3-1debian7.9_all.deb
-
-cd $installLoc/www
-bower install
-npm install
-
 # echo "Setting up Wifi Access Point and DHCP Server"
 # sudo apt-get install -y hostapd isc-dhcp-server
 # sudo cp dhcpd.conf /etc/dhcp/
@@ -133,6 +91,7 @@ sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/mas
 cp .zshrc ~/
 chsh -s $(which zsh)
 
+
 echo "Setup Complete!"
 
 read -n1 -r -p "Press any key to reboot..." key