From 75db9b0ca1647b8024238906a90c1ce174299a7f Mon Sep 17 00:00:00 2001
From: anphi <anne.philipp@univie.ac.at>
Date: Thu, 29 Oct 2020 14:06:26 +0100
Subject: [PATCH] added history information of changes to v7.1.2

---
 Source/Python/Classes/ControlFile.py | 2 ++
 Source/Python/Mods/tools.py          | 4 ++++
 Source/Python/_config.py             | 5 +++++
 Source/Python/install.py             | 5 +++++
 setup_local.sh                       | 9 ++++-----
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/Source/Python/Classes/ControlFile.py b/Source/Python/Classes/ControlFile.py
index fba0721..5783535 100644
--- a/Source/Python/Classes/ControlFile.py
+++ b/Source/Python/Classes/ControlFile.py
@@ -20,6 +20,8 @@
 #        - outsourced the commandline argument assignments to control attributes
 #   June 2020 - Anne Philipp
 #        - update default makefile to None
+#   August 2020 - Leopold Haimberger
+#        - added a class parameter for system installation path
 #
 # @License:
 #    (C) Copyright 2014-2020.
diff --git a/Source/Python/Mods/tools.py b/Source/Python/Mods/tools.py
index b810aa2..254af50 100644
--- a/Source/Python/Mods/tools.py
+++ b/Source/Python/Mods/tools.py
@@ -22,6 +22,10 @@
 #          put_file_to_ecserver, submit_job_to_ecserver, get_informations,
 #          get_dimensions, execute_subprocess, none_or_int, none_or_str
 #
+#    August 2020 - Leopold Haimberger (University of Vienna)
+#        - added function to check if a specific string is in a file
+#        - added function to overwrite lines in a file which contain specific string
+#
 # @License:
 #    (C) Copyright 2014-2020.
 #    Anne Philipp, Leopold Haimberger
diff --git a/Source/Python/_config.py b/Source/Python/_config.py
index 50686e8..49877e7 100644
--- a/Source/Python/_config.py
+++ b/Source/Python/_config.py
@@ -8,6 +8,11 @@
 # @Change History:
 #      June 2020 - Anne Philipp
 #         - changed template filenames to .template
+#      August 2020 - Leopold Haimberger
+#         - added another target for installation
+#         - added filename which will contain paths for system version     
+#         - checks if software runs in normal local mode or system local mode
+#           and defines paths to user directory and executable paths    
 #
 # @License:
 #    (C) Copyright 2014-2020.
diff --git a/Source/Python/install.py b/Source/Python/install.py
index 83a0d81..0488ee0 100755
--- a/Source/Python/install.py
+++ b/Source/Python/install.py
@@ -21,6 +21,11 @@
 #        - reconfigured mk_tarball to select *.template files instead
 #          of *.nl and *.temp
 #        - added check for makefile settings
+#    August 2020 - Leopold Haimberger
+#        - added a new installation section for system installation (if-else block)
+#        - read new argument from command line
+#        - write .setup.rc for a system installation into Run directory
+#        - copy executables to system path and user files to user path
 #
 # @License:
 #    (C) Copyright 2014-2020.
diff --git a/setup_local.sh b/setup_local.sh
index 51d7aa5..776e482 100755
--- a/setup_local.sh
+++ b/setup_local.sh
@@ -30,14 +30,14 @@
 #
 # THE USER HAS TO SPECIFY THESE PARAMETERS
 #
-TARGET='syslocal'
-MAKEFILE='makefile_fast_anne'
+TARGET='local'
+MAKEFILE='makefile_local_gfortran'
 ECUID='<username>'
 ECGID='<groupID>'
 GATEWAY='<gatewayname>'
 DESTINATION='<name>@genericSftp'
-INSTALLDIR=$HOME
-SYSINSTALLDIR=../sys
+INSTALLDIR=None
+SYSINSTALLDIR=None
 JOB_TEMPLATE=''
 CONTROLFILE='CONTROL_CERA'
 # -----------------------------------------------------------------
@@ -98,7 +98,6 @@ fi
 # CALL INSTALLATION SCRIPT WITH DETERMINED COMMANDLINE ARGUMENTS
 
 $script $parameterlist
-source ~/.bashrc
 
 
 
-- 
GitLab