From dc48613c5f08443804d1591dd907106ad95acb43 Mon Sep 17 00:00:00 2001
From: Thomas Fetzer <thomas.fetzer@iws.uni-stuttgart.de>
Date: Tue, 15 Nov 2016 11:23:07 +0100
Subject: [PATCH] [installexternal.sh] Fix download path for UG

* Automatically set the UG path in the *.opts files.
* Remove gstat from *.opts file. Is found automatically, if located in external folder.
---
 bin/installexternal.sh | 11 ++++-------
 debug.opts             |  4 +---
 optim.opts             |  4 +---
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/bin/installexternal.sh b/bin/installexternal.sh
index c4aabda510..85d35cd0f0 100755
--- a/bin/installexternal.sh
+++ b/bin/installexternal.sh
@@ -337,24 +337,20 @@ installUG()
 {
     cd $EXTDIR
 
-    if [ ! -e ug-3.12.1.tar.gz ]; then
-        wget http://conan.iwr.uni-heidelberg.de/download/ug-3.12.1.tar.gz
+    UG_VERSION="3.12.1"
+    if [ ! -e ug-$UG_VERSION ]; then
+        git clone -b v$UG_VERSION https://gitlab.dune-project.org/staging/dune-uggrid.git ug-$UG_VERSION
     fi
 
     if  test "$DOWNLOAD_ONLY" == "y"; then
         return
     fi
 
-    UG_VERSION="3.12.1"
     if  test "$CLEANUP" == "y"; then
         rm -rf ug-$UG_VERSION
         return
     fi
 
-    if ! test -e "ug-$UG_VERSION"; then
-        tar zxvf ug-$UG_VERSION.tar.gz
-    fi
-
     # Apply patch for the parallel use of UG
     cd $TOPDIR/dune-grid
     DUNE_GRID_VERSION=`git status | head -n 1 | awk '{ print $3 }'`
@@ -388,6 +384,7 @@ installUG()
     make
     make install
 
+    sed -i "s#-DUG_DIR=.*#-DUG_DIR=$EXTDIR/ug-$UG_VERSION \\\\#g" $TOPDIR/dumux/*.opts
     cd $TOPDIR
 }
 
diff --git a/debug.opts b/debug.opts
index 925e0ffb07..b8d0705108 100644
--- a/debug.opts
+++ b/debug.opts
@@ -19,12 +19,10 @@ GXX_OPTS=" \
 # configure flags
 CMAKE_FLAGS="\
   -DCMAKE_CXX_FLAGS=\"$GXX_WARNING_OPTS $GXX_OPTS\" \
+  -DUG_DIR=ug_installation_path \
   "
 
 # optional configure flags
 # for the CO2 and CO2ni tests enable the experimental grid extension
 # and make sure the module dune-alugrid is present
 # -DDUNE_GRID_EXPERIMENTAL_GRID_EXTENSIONS=TRUE \
-
-# for using gstat
-# -DGSTAT_ROOT=gstat_installation_path \
diff --git a/optim.opts b/optim.opts
index 937f720422..d27c36ba42 100644
--- a/optim.opts
+++ b/optim.opts
@@ -22,12 +22,10 @@ GXX_OPTS=" \
 # configure flags
 CMAKE_FLAGS=" \
   -DCMAKE_CXX_FLAGS=\"$GXX_WARNING_OPTS $GXX_OPTS\" \
+  -DUG_DIR=ug_installation_path \
   "
 
 # optional configure flags
 # for the CO2 and CO2ni tests enable the experimental grid extension
 # and make sure the module dune-alugrid is present
 # -DDUNE_GRID_EXPERIMENTAL_GRID_EXTENSIONS=TRUE \
-
-# for using gstat
-# -DGSTAT_ROOT=gstat_installation_path \
-- 
GitLab