From 731476b790d772ee374e68deaca2218397584df0 Mon Sep 17 00:00:00 2001
From: Pietro Incardona <incardon@mpi-cbg.de>
Date: Tue, 21 Feb 2017 23:15:33 +0100
Subject: [PATCH] Testing upgrade fix
---
script/update_openfpm | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/script/update_openfpm b/script/update_openfpm
index e481b7dd4..6a28c233f 100755
--- a/script/update_openfpm
+++ b/script/update_openfpm
@@ -36,6 +36,16 @@ function update_openfpm()
fi
fi
+ dir_prev_inst=$(cat dependencies_dir)
+ for_opt=$(cat foward_options)
+ if [ x"$dir_prev_inst" != x"" ]; then
+ dir_prev_inst="-i $dir_prev_inst"
+ fi
+ if [ x"$foward_options" != x"" ]; then
+ foward_options="-c $foward_options"
+ fi
+
+
git stash -u
git submodule foreach 'git stash'
@@ -57,14 +67,6 @@ function update_openfpm()
echo -e "To make the update active do: \033[1m make install \033[0m"
fi
else
- dir_prev_inst=$(cat dependencies_dir)
- for_opt=$(cat foward_options)
- if [ x"$dir_prev_inst" != x"" ]; then
- dir_prev_inst="-i $dir_prev_inst"
- fi
- if [ x"$foward_options" != x"" ]; then
- foward_options="-c $foward_options"
- fi
./install $dir_prev_inst $foward_options
fi
--
GitLab