--- misc/xoa-installer/xoa-installer.sh 2016/09/27 14:26:01 3119 +++ misc/xoa-installer/xoa-installer.sh 2016/09/29 12:41:32 3120 @@ -25,8 +25,8 @@ echo cleaning xo-web rm -rf xo-web - echo cleaning xo-web-v4 - rm -rf xo-web-v4 +# echo cleaning xo-web-v4 +# rm -rf xo-web-v4 echo cleaning xo-server rm -rf xo-server @@ -115,12 +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-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 @@ -156,22 +156,22 @@ 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 .. - +##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 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