From 69ca3f3bc6380e237a09c95d6c59413b8cc8a082 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 25 Apr 2016 18:38:36 +0300 Subject: Fix check_error function. --- .tools/contributors.sh | 2 +- .tools/deploy.sh | 6 +++--- .tools/init.sh | 8 ++++---- .tools/testxml.sh | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to '.tools') diff --git a/.tools/contributors.sh b/.tools/contributors.sh index c9304e3e..dc63b91a 100755 --- a/.tools/contributors.sh +++ b/.tools/contributors.sh @@ -12,7 +12,7 @@ cd tools/contrib_xsl pwd make about-server -check_error +check_error $? cd ../../clientdata pwd diff --git a/.tools/deploy.sh b/.tools/deploy.sh index b5449f6e..17017eb2 100755 --- a/.tools/deploy.sh +++ b/.tools/deploy.sh @@ -20,14 +20,14 @@ gitclone https://gitlab.com/evol/evol-music.git music cd tools/update ./createnew.sh -check_error +check_error $? ./create_music.sh -check_error +check_error $? cp -r upload/* ../../clientdata/public cd ../../clientdata gitclone https://gitlab.com/4144/pagesindexgen.git pagesindexgen cd pagesindexgen ./pagesindexgen.py ../public -check_error +check_error $? ls ../public diff --git a/.tools/init.sh b/.tools/init.sh index a2bda610..0315f39a 100755 --- a/.tools/init.sh +++ b/.tools/init.sh @@ -16,7 +16,7 @@ function gitclone { git clone $* fi fi - check_error + check_error $? } function aptget_update { @@ -29,7 +29,7 @@ function aptget_update { apt-get update fi fi - check_error + check_error $? } function aptget_install { @@ -42,12 +42,12 @@ function aptget_install { apt-get -y -qq install $* fi fi - check_error + check_error $? } function clientdata_init { mkdir shared cd .. ln -s clientdata client-data - check_error + check_error $? } diff --git a/.tools/testxml.sh b/.tools/testxml.sh index c56dbd6f..d28dffb6 100755 --- a/.tools/testxml.sh +++ b/.tools/testxml.sh @@ -11,7 +11,7 @@ gitclone https://gitlab.com/evol/evol-tools.git tools cd tools/testxml ./xsdcheck.sh -check_error +check_error $? export RES=$(cat errors.txt) if [[ -n "${RES}" ]]; then echo "xml check failed" >../../clientdata/shared/error.log -- cgit v1.2.3-60-g2f50