--- misc/xoa-installer/xoa-installer.sh 2018/01/06 20:00:53 3225 +++ misc/xoa-installer/xoa-installer.sh 2018/04/11 12:44:28 3226 @@ -94,10 +94,10 @@ n lts || exit fi -if [ ! -x "/usr/local/bin/gulp" ] ; then - echo "installing gulp" - npm install -g gulp || exit -fi +#if [ ! -x "/usr/local/bin/gulp" ] ; then +# echo "installing gulp" +# npm install -g gulp || exit +#fi if [ ! -x "/usr/local/bin/yarn" ] ; then echo "installing yarn" @@ -105,51 +105,38 @@ fi -if [ ! -x "/usr/local/bin/node-gyp" ] ; then - echo "installing node-gyp" - npm install -g node-gyp || exit -fi +#if [ ! -x "/usr/local/bin/node-gyp" ] ; then +# echo "installing node-gyp" +# npm install -g node-gyp || exit +#fi -if [ ! -d "/usr/local/lib/node_modules/bcrypt" ] ; then - echo "installing bcrypt" - npm install -g --unsafe-perm bcrypt || exit -fi +#if [ ! -d "/usr/local/lib/node_modules/bcrypt" ] ; then +# echo "installing bcrypt" +# npm install -g --unsafe-perm bcrypt || exit +#fi -if [ ! -d "xo-web" ] ; then - git clone -b $BRANCH https://github.com/vatesfr/xo-web.git -else - cd xo-web - git pull - cd .. -fi -if [ ! -d "xo-server" ] ; then - git clone -b $BRANCH https://github.com/vatesfr/xo-server.git +if [ ! -d "xen-orchestra" ] ; then + git clone -b $BRANCH https://github.com/vatesfr/xen-orchestra.git else - cd xo-server + cd xen-orchestra git pull cd .. fi -# xo-server -echo "building xo-server" -cd xo-server - yarn - npm run build -cd .. - -#xo-web -echo "building xo-web" -cd xo-web +# xo-server +echo "building xen-orchestra" +cd xen-orchestra yarn - npm run build + yarn build cd .. + dir=`dirname $0` if [ ! -f "/etc/xo-server/config.yaml" ] ; then