--- misc/xoa-installer/xoa-installer.sh 2016/07/07 10:24:05 3062 +++ misc/xoa-installer/xoa-installer.sh 2016/09/29 12:41:32 3120 @@ -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 @@ -142,10 +151,28 @@ #xo-web echo "building xo-web" cd xo-web - npm install --unsafe-perm || 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 @@ -156,6 +183,6 @@ exit fi -restartxo +#restartxo