Commit 8396c40c authored by Ned Coltman's avatar Ned Coltman
Browse files

Merge branch 'cleanup/installscript_versions' into 'master'

[install] use wget on 3.2 release, adapt folder check

See merge request !101

(cherry picked from commit 336cde8c)

fdd85038 [install] use wget on 3.2 release, adapt folder check
parent c74deb21
...@@ -46,17 +46,17 @@ echo "(1/4) Downloading supplementary files (test script & cmake.opts). Make sur ...@@ -46,17 +46,17 @@ echo "(1/4) Downloading supplementary files (test script & cmake.opts). Make sur
echo "**************************************************************************************************************" echo "**************************************************************************************************************"
# make a new folder containing everything # make a new folder containing everything
mkdir $(pwd)/dumux mkdir $(pwd)/DUMUX
cd dumux cd DUMUX
# download the test script and the cmake.opts # download the test script and the cmake.opts
if [ ! -f "test_dumux.sh" ]; then if [ ! -f "test_dumux.sh" ]; then
wget https://git.iws.uni-stuttgart.de/dumux-repositories/dumux-course/raw/master/scripts/test_dumux.sh wget https://git.iws.uni-stuttgart.de/dumux-repositories/dumux-course/raw/releases/3.2/scripts/test_dumux.sh
fi fi
chmod +x test_dumux.sh chmod +x test_dumux.sh
if [ ! -f "cmake.opts" ]; then if [ ! -f "cmake.opts" ]; then
wget https://git.iws.uni-stuttgart.de/dumux-repositories/dumux-course/raw/master/cmake.opts wget https://git.iws.uni-stuttgart.de/dumux-repositories/dumux-course/raw/releases/3.2/cmake.opts
fi fi
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
...@@ -109,7 +109,9 @@ if [ ! -d "dumux" ]; then ...@@ -109,7 +109,9 @@ if [ ! -d "dumux" ]; then
git clone -b releases/3.2 https://git.iws.uni-stuttgart.de/dumux-repositories/dumux.git git clone -b releases/3.2 https://git.iws.uni-stuttgart.de/dumux-repositories/dumux.git
else else
echo "Skip cloning dumux because the folder already exists." echo "Skip cloning dumux because the folder already exists."
cd dumux
git checkout releases/3.2 git checkout releases/3.2
cd ..
fi fi
# dumux-course # dumux-course
...@@ -117,7 +119,9 @@ if [ ! -d "dumux-course" ]; then ...@@ -117,7 +119,9 @@ if [ ! -d "dumux-course" ]; then
git clone -b releases/3.2 https://git.iws.uni-stuttgart.de/dumux-repositories/dumux-course.git git clone -b releases/3.2 https://git.iws.uni-stuttgart.de/dumux-repositories/dumux-course.git
else else
echo "Skip cloning dumux-course because the folder already exists." echo "Skip cloning dumux-course because the folder already exists."
cd dumux-course
git checkout releases/3.2 git checkout releases/3.2
cd ..
fi fi
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment