--- misc/xoa-installer/xoa-installer.sh	2016/03/19 08:24:48	2982
+++ misc/xoa-installer/xoa-installer.sh	2016/03/28 15:43:06	2989
@@ -1,9 +1,13 @@
 #!/bin/bash
 
 
-# npm install -g npm@next
+# Note: this script works on debian 7 /wheezy
+# I haven't yet managed to get it to work on deb8/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=next-release
 BRANCH=master
 
 
@@ -54,6 +58,11 @@
 	apt-get install  build-essential || exit
 fi
 
+if [ ! -f "/usr/include/libpng12/png.h" ] ; then
+	echo "installing libpng"
+	apt-get install libpng12-dev || exit
+fi
+
 if [ ! -x "/usr/bin/redis-server" ] ; then
 	echo "installing redis-server"
 	apt-get install  redis-server || exit
@@ -61,7 +70,7 @@
 
 if [ ! -x "/usr/bin/git" ] ; then
 	echo "installing git"
-	apt-get install git
+	apt-get install git || exit
 fi
 	
 
@@ -78,22 +87,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 
@@ -129,6 +138,11 @@
 npm run build || exit
 cd ..
 
+if [ ! -f "/etc/xo-server/config.yaml" ] then
+	echo "please setup /etc/xo-server/config.yaml"
+	exit
+fi
+
 restartxo