Revised setup start and stop scripts

diff --git a/start b/start
old mode 100755 (executable)
new mode 100644 (file)
index 8d8c89b..b0cafa3
--- a/start
+++ b/start
@@ -1,20 +1,52 @@
 #!/bin/bash
 
-ps waux | grep node | grep -v grep
+# TODO update this with the contents of new.sh
+exit # This breaks the script before it does anything else
+
+export PATH="/usr/local/bin:$PATH"
+
+cd ~
+rm -rf bc
+git clone git://github.com/finalsclubdev/bc.git
+cd ~/bc
+npm install connect
+npm install socket.io
+npm install express-messages
+npm install jade
+
+cd ~
+rm -rf FinalsClub
+git clone git://github.com/finalsclubdev/FinalsClub.git
+ln -sf FinalsClub fc
+
+cd ~/fc
+git checkout master
+git submodule init && git submodule update
+npm install
+cd etherpad-lite
+npm install
+
+# install some dependencies
+cd ~/fc
+npm install connect
+npm install socket.io
+npm install express-messages
+npm install jade
+
+
+## init fcbackup 
+cd ~/fc/fcbackups
+chmod 775 fcbackup_init.sh
+./fcbackup_init.sh
+
+
+## start the server
+cd ~/fc
+./restart
+
+
 
-echo "starting ..."
 
-if [ "$(id -u)" != "0" ]; then
-       ## note: start as root, pass env vars to sudo param, this app will downgrade itself once it has initialized
-       sudo -E forever app.js &> log.txt &
-else
-       forever app.js &> log.txt &
-fi
 
-cd etherpad-lite/node
-forever server.js &> log.txt &
-cd ../..
 
-sleep 3
-ps waux | grep node | grep -v grep
 

diff --git a/start.sh b/start.sh
deleted file mode 100644 (file)
index b0cafa3..0000000
--- a/start.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-# TODO update this with the contents of new.sh
-exit # This breaks the script before it does anything else
-
-export PATH="/usr/local/bin:$PATH"
-
-cd ~
-rm -rf bc
-git clone git://github.com/finalsclubdev/bc.git
-cd ~/bc
-npm install connect
-npm install socket.io
-npm install express-messages
-npm install jade
-
-cd ~
-rm -rf FinalsClub
-git clone git://github.com/finalsclubdev/FinalsClub.git
-ln -sf FinalsClub fc
-
-cd ~/fc
-git checkout master
-git submodule init && git submodule update
-npm install
-cd etherpad-lite
-npm install
-
-# install some dependencies
-cd ~/fc
-npm install connect
-npm install socket.io
-npm install express-messages
-npm install jade
-
-
-## init fcbackup 
-cd ~/fc/fcbackups
-chmod 775 fcbackup_init.sh
-./fcbackup_init.sh
-
-
-## start the server
-cd ~/fc
-./restart
-
-
-
-
-
-
-