summaryrefslogtreecommitdiff
path: root/.tools
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-04-25 18:17:35 +0300
committerAndrei Karas <akaras@inbox.ru>2016-04-25 18:17:35 +0300
commit1d64dcc47323ca474d300b3888f05625760cd519 (patch)
tree6c61dfdcf980730cf3325d88d235caf77eebde8e /.tools
parent8b1c82f07ed3bbb53e6e5307d11c634649d886f8 (diff)
downloadclientdata-1d64dcc47323ca474d300b3888f05625760cd519.tar.gz
clientdata-1d64dcc47323ca474d300b3888f05625760cd519.tar.bz2
clientdata-1d64dcc47323ca474d300b3888f05625760cd519.tar.xz
clientdata-1d64dcc47323ca474d300b3888f05625760cd519.zip
Check for error after most ci scripts.
Diffstat (limited to '.tools')
-rwxr-xr-x.tools/contributors.sh2
-rwxr-xr-x.tools/deploy.sh3
-rwxr-xr-x.tools/init.sh10
-rwxr-xr-x.tools/testxml.sh1
4 files changed, 16 insertions, 0 deletions
diff --git a/.tools/contributors.sh b/.tools/contributors.sh
index 313cf905..2fa95fff 100755
--- a/.tools/contributors.sh
+++ b/.tools/contributors.sh
@@ -11,6 +11,8 @@ gitclone https://gitlab.com/evol/evol-tools.git tools
cd tools/contrib_xsl
make about-server
+check_error
+
cd ../../clientdata
export RES=$(git diff)
diff --git a/.tools/deploy.sh b/.tools/deploy.sh
index 786062ca..b5449f6e 100755
--- a/.tools/deploy.sh
+++ b/.tools/deploy.sh
@@ -20,11 +20,14 @@ gitclone https://gitlab.com/evol/evol-music.git music
cd tools/update
./createnew.sh
+check_error
./create_music.sh
+check_error
cp -r upload/* ../../clientdata/public
cd ../../clientdata
gitclone https://gitlab.com/4144/pagesindexgen.git pagesindexgen
cd pagesindexgen
./pagesindexgen.py ../public
+check_error
ls ../public
diff --git a/.tools/init.sh b/.tools/init.sh
index e1073e02..a2bda610 100755
--- a/.tools/init.sh
+++ b/.tools/init.sh
@@ -1,5 +1,11 @@
#!/bin/bash
+function check_error {
+ if [ "$1" != 0 ]; then
+ exit $result
+ fi
+}
+
function gitclone {
git clone $*
if [ "$?" != 0 ]; then
@@ -10,6 +16,7 @@ function gitclone {
git clone $*
fi
fi
+ check_error
}
function aptget_update {
@@ -22,6 +29,7 @@ function aptget_update {
apt-get update
fi
fi
+ check_error
}
function aptget_install {
@@ -34,10 +42,12 @@ function aptget_install {
apt-get -y -qq install $*
fi
fi
+ check_error
}
function clientdata_init {
mkdir shared
cd ..
ln -s clientdata client-data
+ check_error
}
diff --git a/.tools/testxml.sh b/.tools/testxml.sh
index 2b8b20d8..c56dbd6f 100755
--- a/.tools/testxml.sh
+++ b/.tools/testxml.sh
@@ -11,6 +11,7 @@ gitclone https://gitlab.com/evol/evol-tools.git tools
cd tools/testxml
./xsdcheck.sh
+check_error
export RES=$(cat errors.txt)
if [[ -n "${RES}" ]]; then
echo "xml check failed" >../../clientdata/shared/error.log