--- misc/xoa-installer/xoa-installer.sh	2016/03/19 12:43:25	2986
+++ misc/xoa-installer/xoa-installer.sh	2016/07/07 10:24:05	3062
@@ -1,11 +1,13 @@
 #!/bin/bash
 
 
-# Note: this script works on debian 7 /wheezy
-# I haven't yet managed to get it to work on deb8/jessie
-# I running on a raspberry1 raspian/wheezy - downgrade node.js to 5.4.0
+# 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
+BRANCH=stable
 
 
 function restartxo {
@@ -38,7 +40,7 @@
 	echo cleaning .forever
 	rm -rf .forever
 	rm -rf forever.log
-	
+
 
 	echo done
 	exit
@@ -69,7 +71,7 @@
 	echo "installing git"
 	apt-get install git || exit
 fi
-	
+
 
 if [ ! -x "/usr/local/bin/n" ] ; then
 	echo "installing node.js bootstrap"
@@ -123,19 +125,33 @@
 # xo-server
 echo "building xo-server"
 cd xo-server
-npm install || exit
-npm run build || exit
+	npm install || exit
+	npm run build || exit
+
+	#for some reasone leveldown  fails occasionally on arm/raspberry pi
+	if [ ! -d "/root/xo-server/node_modules/leveldown/build" ] ; then
+		pushd node_modules/leveldown
+		node-gyp configure || exit
+		node-gyp build || exit
+		popd
+	fi
 cd ..
 
 
+
 #xo-web
 echo "building xo-web"
 cd xo-web
-npm install --unsafe-perm || exit
-npm run build || exit
+	npm install --unsafe-perm || exit
+	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