Commit a808e347 authored by Laurent Heirendt's avatar Laurent Heirendt
Browse files

Merge branch 'develop' into 'master'

Regular merge of develop

See merge request !62
parents ff36fda8 37222bd3
Pipeline #21178 passed with stage
in 3 minutes
...@@ -9,6 +9,12 @@ echo $rootDir ...@@ -9,6 +9,12 @@ echo $rootDir
rm -rf $rootDir/public rm -rf $rootDir/public
mkdir $rootDir/public mkdir $rootDir/public
# create img folders
mkdir $rootDir/public/img
mkdir $rootDir/public/img/unstable
mkdir $rootDir/public/img/latest
mkdir $rootDir/public/img/stable
# loop through all the presentations # loop through all the presentations
nBlades=0 nBlades=0
for d in $(find . -maxdepth 1 -type d) for d in $(find . -maxdepth 1 -type d)
...@@ -51,6 +57,12 @@ do ...@@ -51,6 +57,12 @@ do
grunt dist grunt dist
mv public/* $rootDir/public/$BLADE/unstable/. mv public/* $rootDir/public/$BLADE/unstable/.
# link to the img directory
mv $rootDir/public/$BLADE/unstable/slides/img/* $rootDir/public/img/unstable/.
rm -rf $rootDir/public/$BLADE/unstable/slides/img
ln -s ../../../img/unstable $rootDir/public/$BLADE/unstable/slides/img
echo " > unstable built for file set ${BLADE}" echo " > unstable built for file set ${BLADE}"
# build the master version into stable # build the master version into stable
...@@ -61,6 +73,12 @@ do ...@@ -61,6 +73,12 @@ do
git submodule update --init git submodule update --init
grunt dist grunt dist
mv public/* $rootDir/public/$BLADE/stable/. mv public/* $rootDir/public/$BLADE/stable/.
# link to the img directory
mv $rootDir/public/$BLADE/stable/slides/img/* $rootDir/public/img/stable/.
rm -rf $rootDir/public/$BLADE/stable/slides/img
ln -s ../../../img/stable $rootDir/public/$BLADE/stable/slides/img
echo " > stable built for file set ${BLADE}" echo " > stable built for file set ${BLADE}"
# build the develop version into latest # build the develop version into latest
...@@ -71,6 +89,12 @@ do ...@@ -71,6 +89,12 @@ do
git submodule update --init git submodule update --init
grunt dist grunt dist
mv public/* $rootDir/public/$BLADE/latest/. mv public/* $rootDir/public/$BLADE/latest/.
# link to the img directory
mv $rootDir/public/$BLADE/latest/slides/img/* $rootDir/public/img/latest/.
rm -rf $rootDir/public/$BLADE/latest/slides/img
ln -s ../../../img/latest $rootDir/public/$BLADE/latest/slides/img
echo " > latest built for file set ${BLADE}" echo " > latest built for file set ${BLADE}"
# auto redirect file to the stable version # auto redirect file to the stable version
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment