--- misc/xoa-installer/xoa-installer.sh	2016/03/19 12:02:38	2984
+++ misc/xoa-installer/xoa-installer.sh	2016/03/28 16:40:48	2990
@@ -1,9 +1,11 @@
 #!/bin/bash
 
 
-# Note: this script works on debian 7 /wheezy
-# I haven't yet managed to get it to work on deb8/jessie
-
+# Note: this script works on debian 7/wheezy and debian 8/jessie
+#
+# If running on a raspberry 1(A/B) raspian/wheezy - downgrade node.js to 5.4.0
+# Please note that raspian/wheezy for arm defaults to gcc 4.6
+# gcc 4.7 is needed for compiling node-js modules
 
 BRANCH=master
 
@@ -38,7 +40,7 @@
 	echo cleaning .forever
 	rm -rf .forever
 	rm -rf forever.log
-	
+
 
 	echo done
 	exit
@@ -57,7 +59,7 @@
 
 if [ ! -f "/usr/include/libpng12/png.h" ] ; then
 	echo "installing libpng"
-	apt-get install libpng12-dev
+	apt-get install libpng12-dev || exit
 fi
 
 if [ ! -x "/usr/bin/redis-server" ] ; then
@@ -67,9 +69,9 @@
 
 if [ ! -x "/usr/bin/git" ] ; then
 	echo "installing git"
-	apt-get install git
+	apt-get install git || exit
 fi
-	
+
 
 if [ ! -x "/usr/local/bin/n" ] ; then
 	echo "installing node.js bootstrap"
@@ -84,22 +86,22 @@
 
 if [ ! -x "/usr/local/bin/gulp" ] ; then
 	echo "installing gulp"
-	npm install -g gulp
+	npm install -g gulp || exit
 fi
 
 if [ ! -x "/usr/local/bin/forever" ] ; then
 	echo "installing forever"
-	npm install -g forever
+	npm install -g forever || exit
 fi
 
 if [ ! -x "/usr/local/bin/node-gyp" ] ; then
 	echo "installing node-gyp"
-	npm install -g node-gyp
+	npm install -g node-gyp || exit
 fi
 
 if [ ! -d "/usr/local/lib/node_modules/bcrypt" ] ; then
 	echo "installing bcrypt"
-	npm install -g bcrypt
+	npm install -g bcrypt || exit
 fi
 
 if [ ! -d "xo-web" ] ; then 
@@ -135,7 +137,11 @@
 npm run build || exit
 cd ..
 
-if [ ! -f "/etc/xo-server/config.yaml" ] then
+if [ ! -f "/etc/xo-server/config.yaml" ] ; then
+	if  [ ! -d "/etc/xo-server" ] ; then
+		mkdir /etc/xo-server
+	fi
+
 	echo "please setup /etc/xo-server/config.yaml"
 	exit
 fi