Exit if error

parent 773b1d2d
...@@ -24,7 +24,7 @@ sed $VERSION_REGEX $TEMPLATES_DIRECTORY/offline.sh.in > $CURRENT_DIRECTORY/$SLAP ...@@ -24,7 +24,7 @@ sed $VERSION_REGEX $TEMPLATES_DIRECTORY/offline.sh.in > $CURRENT_DIRECTORY/$SLAP
# Prepare Download Cache for SlapOS # Prepare Download Cache for SlapOS
cd $CURRENT_DIRECTORY/$SLAPOS_DIRECTORY/slapos/ cd $CURRENT_DIRECTORY/$SLAPOS_DIRECTORY/slapos/
#rm -rf build/ #rm -rf build/
bash offline.sh bash offline.sh || (echo "Impossible to build SlapOS, exiting." && exit 1)
# Prepare tarball # Prepare tarball
cd $CURRENT_DIRECTORY cd $CURRENT_DIRECTORY
......
...@@ -28,8 +28,8 @@ sed "s/\%RECIPE_VERSION\%/$RECIPE_VERSION/g;s|\%PATCHES_DIRECTORY\%|$PATCHES_DI ...@@ -28,8 +28,8 @@ sed "s/\%RECIPE_VERSION\%/$RECIPE_VERSION/g;s|\%PATCHES_DIRECTORY\%|$PATCHES_DI
# Build first time to get download-cache and extends-cache ready # Build first time to get download-cache and extends-cache ready
cd $BUILD_DIRECTORY cd $BUILD_DIRECTORY
wget $BOOTSTRAP_URL -O bootstrap.py wget $BOOTSTRAP_URL -O bootstrap.py
python -S bootstrap.py #&& \ (python -S bootstrap.py && \
./bin/buildout ./bin/buildout) || (echo "Failed to run buildout, exiting." && exit 1)
cd $BUILD_ROOT_DIRECTORY/.. cd $BUILD_ROOT_DIRECTORY/..
......
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