From 26137091132ee2567f68ffda3a3ded075fe0b459 Mon Sep 17 00:00:00 2001
From: Pietro Incardona <incardon@mpi-cbg.de>
Date: Mon, 7 Sep 2015 20:46:38 +0200
Subject: [PATCH] Fixing install and jenkin scripts

---
 build_pdata.sh | 38 ++++++++++++++++++++++++++++++++++++++
 install        | 32 --------------------------------
 2 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/build_pdata.sh b/build_pdata.sh
index 7fc99727..96a3eafe 100644
--- a/build_pdata.sh
+++ b/build_pdata.sh
@@ -8,7 +8,45 @@ echo "Machine: $2"
 mkdir src/config
 
 git submodule init
+
+# pull from all the projects
+cd openfpm_data
+git pull origin develop
+if [ $? -ne 0 ]; then
+  echo -e "Configure\033[91;5;1m FAILED \033[0m"
+  exit 1
+fi
+cd ..
+
+cd openfpm_devices
+git pull origin master
+if [ $? -ne 0 ]; then
+  echo -e "Configure\033[91;5;1m FAILED \033[0m"
+  exit 1
+fi
+cd ..
+
+cd openfpm_vcluster
+git pull origin master
+if [ $? -ne 0 ]; then
+  echo -e "Configure\033[91;5;1m FAILED \033[0m"
+  exit 1
+fi
+cd ..
+
+cd openfpm_io
+git pull origin master
+if [ $? -ne 0 ]; then
+  echo -e "Configure\033[91;5;1m FAILED \033[0m"
+  exit 1
+fi
+cd ..
+
 git submodule update
+if [ $? -ne 0 ]; then
+  echo -e "Configure\033[91;5;1m FAILED \033[0m"
+  exit 1
+fi
 
 cd openfpm_data
 git checkout develop
diff --git a/install b/install
index 1bcac06f..5a559462 100755
--- a/install
+++ b/install
@@ -49,38 +49,6 @@ if [ $? -ne 0 ]; then
   echo -e "Configure\033[91;5;1m FAILED \033[0m"
   exit 1
 fi
-# pull from all the projects
-cd openfpm_data
-git pull origin develop
-if [ $? -ne 0 ]; then
-  echo -e "Configure\033[91;5;1m FAILED \033[0m"
-  exit 1
-fi
-cd ..
-
-cd openfpm_devices
-git pull origin master
-if [ $? -ne 0 ]; then
-  echo -e "Configure\033[91;5;1m FAILED \033[0m"
-  exit 1
-fi
-cd ..
-
-cd openfpm_vcluster
-git pull origin master
-if [ $? -ne 0 ]; then
-  echo -e "Configure\033[91;5;1m FAILED \033[0m"
-  exit 1
-fi
-cd ..
-
-cd openfpm_io
-git pull origin master
-if [ $? -ne 0 ]; then
-  echo -e "Configure\033[91;5;1m FAILED \033[0m"
-  exit 1
-fi
-cd ..
 
 git submodule update
 if [ $? -ne 0 ]; then
-- 
GitLab