[scripts] Add gnuplot to requirements

scripts/README.md

@@ -13,21 +13,19 @@ You need to have the following REQUIREMENTS installed:
   * git
   * pkg-config
   * paraview (to visualize the results)
+  * gnuplot (to plot some curves)
+  * wget (to download some config files during the installation)
 
 On debian-based system you can use this:
-  apt-get install build-essential pkg-config cmake git paraview
+  apt-get install build-essential pkg-config cmake git paraview wget gnuplot
 
 Then, you can the execute the script and it will download the dune repositories and dumux
 and configure all modules with CMake
   ./install.sh
-This will clone the necessary repositories (in a subfolder 'dune'),
+This will clone the necessary repositories (in a subfolder 'dumux'),
 build all libaries.
 
-The dune core modules are also available as debian packages
-(see http://www.dune-project.org/download.html#binary) where
-the version 2.4 is required.
-
-Run the script test_dumux.sh in the same folder you ran this script
+Run the script test_dumux.sh in the newly created dumux folder
 to test your installation of dumux.
   ./test_dumux.sh
 It will compile and run a simple one-phase ground water flow example

scripts/install.sh

@@ -2,7 +2,7 @@
 DUNE_VERSION=2.6
 
 # check some prerequistes
-for PRGRM in git cmake gcc g++ wget paraview pkg-config; do
+for PRGRM in git cmake gcc g++ wget paraview pkg-config gnuplot; do
     if ! [ -x "$(command -v $PRGRM)" ]; then
         echo "Error: $PRGRM is not installed." >&2
         exit 1
@@ -29,9 +29,14 @@ echo "(0/2) Downloading supplementary files. Make sure to be connected to the in
 echo "*********************************************************************************************"
 
 # download the install.opts and the test script
-wget https://git.iws.uni-stuttgart.de/dumux-repositories/dumux-course/raw/master/scripts/test_dumux.sh
-chmod +x test_dumux.sh
-wget https://git.iws.uni-stuttgart.de/dumux-repositories/dumux-course/raw/master/cmake.opts
+if [ ! -f "test_dumux.sh" ]; then
+    wget https://git.iws.uni-stuttgart.de/dumux-repositories/dumux-course/raw/master/scripts/test_dumux.sh
+    chmod +x test_dumux.sh
+fi
+if [ ! -f "cmake.opts" ]; then
+    wget https://git.iws.uni-stuttgart.de/dumux-repositories/dumux-course/raw/master/cmake.opts
+    chmod +x test_dumux.sh
+fi
 
 # get the testing script
 
@@ -64,11 +69,11 @@ done
 
 # dune-subgrid
 if [ ! -d "dune-subgrid" ]; then
-    git clone -b releases/$DUNE_VERSION https://git.imp.fu-berlin.de/agnumpde/dune-subgrid.git
+    git clone -b releases/$DUNE_VERSION-1 https://git.imp.fu-berlin.de/agnumpde/dune-subgrid.git
 else
     echo "Skip cloning dune-subgrid because the folder already exists."
     cd dune-subgrid
-    git checkout releases/$DUNE_VERSION
+    git checkout releases/$DUNE_VERSION-1
     cd ..
 fi