/[projects]/misc/xoa-installer/xoa-installer.sh
ViewVC logotype

Diff of /misc/xoa-installer/xoa-installer.sh

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3119 by torben, Wed Aug 31 09:12:33 2016 UTC revision 3120 by torben, Thu Sep 29 12:41:32 2016 UTC
# Line 25  if [ "$1" == "clean" ] ; then Line 25  if [ "$1" == "clean" ] ; then
25          echo cleaning xo-web          echo cleaning xo-web
26          rm -rf xo-web          rm -rf xo-web
27    
28          echo cleaning xo-web-v4  #       echo cleaning xo-web-v4
29          rm -rf xo-web-v4  #       rm -rf xo-web-v4
30    
31          echo cleaning xo-server          echo cleaning xo-server
32          rm -rf xo-server          rm -rf xo-server
# Line 115  else Line 115  else
115          cd ..          cd ..
116  fi  fi
117    
118  if [ ! -d "xo-web-v4" ] ; then  #if [ ! -d "xo-web-v4" ] ; then
119          git clone -b $BRANCH https://github.com/vatesfr/xo-web.git xo-web-v4  #       git clone -b $BRANCH https://github.com/vatesfr/xo-web.git xo-web-v4
120          cd xo-web-v4  #       cd xo-web-v4
121          git checkout tags/v4.16.0  #       git checkout tags/v4.16.0
122          cd ..  #       cd ..
123  fi  #fi
124    
125  if [ ! -d "xo-server" ] ; then  if [ ! -d "xo-server" ] ; then
126          git clone -b $BRANCH https://github.com/vatesfr/xo-server.git          git clone -b $BRANCH https://github.com/vatesfr/xo-server.git
# Line 156  cd xo-web Line 156  cd xo-web
156          npm run build || exit          npm run build || exit
157  cd ..  cd ..
158    
159  #xo-web-v4  ##xo-web-v4
160  echo "building xo-web-v4"  #echo "building xo-web-v4"
161  cd xo-web-v4  #cd xo-web-v4
162          npm install || exit  #       npm install || exit
163          npm run build || exit  #       npm run build || exit
164  cd ..  #cd ..
   
165    
166    
 if [ ! -f xo-web/dist/styles/main.css ] ; then  
         mkdir xo-web/dist/styles  
         mkdir xo-web/dist/images  
167    
168          cp xo-web-v4/dist/styles/main.css xo-web/dist/styles/main.css  #if [ ! -f xo-web/dist/styles/main.css ] ; then
169          cp xo-web-v4/dist/images/logo_small.png xo-web/dist/images/logo_small.png  #       mkdir xo-web/dist/styles
170  fi  #       mkdir xo-web/dist/images
171    #
172    #       cp xo-web-v4/dist/styles/main.css xo-web/dist/styles/main.css
173    #       cp xo-web-v4/dist/images/logo_small.png xo-web/dist/images/logo_small.png
174    #fi
175    
176    
177  if [ ! -f "/etc/xo-server/config.yaml" ] ; then  if [ ! -f "/etc/xo-server/config.yaml" ] ; then

Legend:
Removed from v.3119  
changed lines
  Added in v.3120

  ViewVC Help
Powered by ViewVC 1.1.20