--- misc/xoa-installer/xoa-installer.sh	2016/03/19 08:23:22	2981
+++ misc/xoa-installer/xoa-installer.sh	2016/03/19 12:02:38	2984
@@ -1,9 +1,10 @@
 #!/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
+
 
-#BRANCH=next-release
 BRANCH=master
 
 
@@ -54,6 +55,11 @@
 	apt-get install  build-essential || exit
 fi
 
+if [ ! -f "/usr/include/libpng12/png.h" ] ; then
+	echo "installing libpng"
+	apt-get install libpng12-dev
+fi
+
 if [ ! -x "/usr/bin/redis-server" ] ; then
 	echo "installing redis-server"
 	apt-get install  redis-server || exit
@@ -91,7 +97,7 @@
 	npm install -g node-gyp
 fi
 
-if [ ! -d "/usr/local/lib/node_modules" ] ; then
+if [ ! -d "/usr/local/lib/node_modules/bcrypt" ] ; then
 	echo "installing bcrypt"
 	npm install -g bcrypt
 fi
@@ -129,6 +135,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