Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Sbalzarini Lab
S
Software
P
Parallel Computing
OpenFPM
openfpm_pdata
Commits
2789a62c
Commit
2789a62c
authored
Apr 19, 2018
by
incardon
Browse files
Fixing update target
parent
59bcb163
Changes
3
Show whitespace changes
Inline
Side-by-side
script/update_openfpm
View file @
2789a62c
...
...
@@ -4,10 +4,8 @@ source script/show_solutions
function
update_openfpm
()
{
echo
-e
"
\0
33[1;5;31m WARNING: the update will destroy any changes in the OpenFPM source code
\0
33[0m"
echo
-e
"
\0
33[1;5;31m WARNING: the update will destroy any changes
you made
in the OpenFPM source code
\0
33[0m"
commands[0]
=
"Continue"
commands[0]
=
"
${
commands
[@]
}
"
possible_solutions
"
${
commands
[@]
}
"
## Get the name of the updating branch
...
...
@@ -16,25 +14,24 @@ function update_openfpm()
echo
"Checking for update from
$url_update
"
rm
tmp_brc
wget
-O
tmp_brc
$url_update
branch
=
$(
cat
tmp_brc
)
echo
"Update
branch
$branch
"
if
[
x
"
$
branch
"
==
x
""
]
;
then
repo
=
$(
cat
tmp_brc
)
echo
"Update
repo
$repo
"
if
[
x
"
$
repo
"
==
x
""
]
;
then
echo
-e
"
\0
33[1m There are no-updates
\0
33[0m"
return
fi
actual_branch
=
$(
git branch |
grep
\*
|
cut
-d
' '
-f2
)
if
[
x
"
$branch
"
==
x
"
$actual_branch
"
]
;
then
git remote set-url origin
"
$repo
"
git remote update
n_commit
=
$(
git rev-list
--count
origin/
$branch
...
$branch
)
n_commit
=
$(
git rev-list
--count
origin/
master...master
)
if
[
$n_commit
-eq
0
]
;
then
echo
-e
"
\0
33[1m There are no-updates
\0
33[0m"
return
fi
fi
dir_prev_inst
=
$(
cat
dependencies_dir
)
for_opt
=
$(
cat
foward_options
)
...
...
@@ -50,7 +47,6 @@ function update_openfpm()
git submodule foreach
'git stash'
git pull origin
git checkout
$branch
git submodule update
#### Check if we have to force upgrade
...
...
update
View file @
2789a62c
http://openfpm.mpi-cbg.de/upload/update_
dev
http://openfpm.mpi-cbg.de/upload/update_
110
upgrade
View file @
2789a62c
openfpm.mpi-cbg.de/upload/up
date_0.8
openfpm.mpi-cbg.de/upload/up
grade_110
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment