From 45f55d340ceda73c6d6518b3edd7a4da18c67dd7 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 25 Apr 2016 17:27:48 +0300
Subject: gitlab-ci: move shared code into init.sh

---
 gitlab-ci/clientdata/deploy.sh  | 20 ++++----------------
 gitlab-ci/clientdata/testxml.sh | 23 ++---------------------
 gitlab-ci/init.sh               | 22 ++++++++++++++++++++++
 3 files changed, 28 insertions(+), 37 deletions(-)
 create mode 100755 gitlab-ci/init.sh

diff --git a/gitlab-ci/clientdata/deploy.sh b/gitlab-ci/clientdata/deploy.sh
index 4afc0cd..1ec39f8 100755
--- a/gitlab-ci/clientdata/deploy.sh
+++ b/gitlab-ci/clientdata/deploy.sh
@@ -1,23 +1,11 @@
 #!/bin/bash
 
-cd clientdata
+source ./tools/gitlab-ci/init.sh
+
+clientdata_init
+
 rm -rf public
 mkdir public
-mkdir shared
-echo >shared/error.log
-echo ${CI_BUILD_ID} >shared/buildid.log
-
-function gitclone {
-    git clone $*
-    if [ "$?" != 0 ]; then
-        sleep 1s
-        git clone $*
-        if [ "$?" != 0 ]; then
-            sleep 3s
-            git clone $*
-        fi
-    fi
-}
 
 cd ..
 ln -s clientdata client-data
diff --git a/gitlab-ci/clientdata/testxml.sh b/gitlab-ci/clientdata/testxml.sh
index 64915b4..9295ec3 100755
--- a/gitlab-ci/clientdata/testxml.sh
+++ b/gitlab-ci/clientdata/testxml.sh
@@ -1,33 +1,14 @@
 #!/bin/bash
 
-cd clientdata
-rm -rf public
-mkdir public
-mkdir shared
-echo >shared/error.log
-echo ${CI_BUILD_ID} >shared/buildid.log
+source ./tools/gitlab-ci/init.sh
 
-function gitclone {
-    git clone $*
-    if [ "$?" != 0 ]; then
-        sleep 1s
-        git clone $*
-        if [ "$?" != 0 ]; then
-            sleep 3s
-            git clone $*
-        fi
-    fi
-}
-
-cd ..
-ln -s clientdata client-data
+clientdata_init
 
 cd tools/testxml
 
 ./xsdcheck.sh
 export RES=$(cat errors.txt)
 if [[ -n "${RES}" ]]; then
-    echo "xml check failed"
     echo "xml check failed" >../../clientdata/shared/error.log
     echo ${RES} >>../../clientdata/shared/error.log
     cat ../../clientdata/shared/error.log
diff --git a/gitlab-ci/init.sh b/gitlab-ci/init.sh
new file mode 100755
index 0000000..f8831c3
--- /dev/null
+++ b/gitlab-ci/init.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+function gitclone {
+    git clone $*
+    if [ "$?" != 0 ]; then
+        sleep 1s
+        git clone $*
+        if [ "$?" != 0 ]; then
+            sleep 3s
+            git clone $*
+        fi
+    fi
+}
+
+function clientdata_init {
+    cd clientdata
+    mkdir shared
+    echo >shared/error.log
+    echo ${CI_BUILD_ID} >shared/buildid.log
+}
+
+ln -s clientdata client-data
-- 
cgit v1.2.3-70-g09d2