--- misc/xoa-installer/xoa-installer.sh 2016/03/28 16:40:48 2990 +++ misc/xoa-installer/xoa-installer.sh 2016/08/31 09:12:33 3109 @@ -7,7 +7,7 @@ # 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 { @@ -25,6 +25,9 @@ echo cleaning xo-web rm -rf xo-web + echo cleaning xo-web-v4 + rm -rf xo-web-v4 + echo cleaning xo-server rm -rf xo-server @@ -112,6 +115,12 @@ cd .. fi +if [ ! -d "xo-web-v4" ] ; then + git clone -b $BRANCH https://github.com/vatesfr/xo-web.git xo-web-v4 + cd xo-web-v4 + git checkout tags/v4.16.0 + cd .. +fi if [ ! -d "xo-server" ] ; then git clone -b $BRANCH https://github.com/vatesfr/xo-server.git @@ -125,18 +134,46 @@ # 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 install || exit + npm run build || exit +cd .. + +#xo-web-v4 +echo "building xo-web-v4" +cd xo-web-v4 + npm install || exit + npm run build || exit cd .. + + +if [ ! -f xo-web/dist/styles/main.css ] ; then + mkdir xo-web/dist/styles + mkdir xo-web/dist/images + + cp xo-web-v4/dist/styles/main.css xo-web/dist/styles/main.css + cp xo-web-v4/dist/images/logo_small.png xo-web/dist/images/logo_small.png +fi + + if [ ! -f "/etc/xo-server/config.yaml" ] ; then if [ ! -d "/etc/xo-server" ] ; then mkdir /etc/xo-server @@ -146,6 +183,6 @@ exit fi -restartxo +#restartxo