From 4ac2056dffed9c42f494e923f0bdf5c08a287db9 Mon Sep 17 00:00:00 2001
From: Martin Diehl <mail@martin-diehl.net>
Date: Tue, 30 Nov 2021 17:46:50 +0100
Subject: [PATCH] leave installdir alone

---
 install/MarcMentat/2020/Mentat_bin/submit4.patch     | 10 ----------
 install/MarcMentat/2020/Mentat_bin/submit5.patch     | 10 ----------
 install/MarcMentat/2020/Mentat_bin/submit6.patch     | 10 ----------
 install/MarcMentat/2021.2/Mentat_bin/submit4.patch   | 10 ----------
 install/MarcMentat/2021.2/Mentat_bin/submit5.patch   | 10 ----------
 install/MarcMentat/2021.2/Mentat_bin/submit6.patch   | 10 ----------
 install/MarcMentat/2021.3.1/Mentat_bin/submit4.patch | 10 ----------
 install/MarcMentat/2021.3.1/Mentat_bin/submit5.patch | 10 ----------
 install/MarcMentat/2021.3.1/Mentat_bin/submit6.patch | 10 ----------
 install/MarcMentat/apply_DAMASK_modifications.py     |  3 +--
 10 files changed, 1 insertion(+), 92 deletions(-)

diff --git a/install/MarcMentat/2020/Mentat_bin/submit4.patch b/install/MarcMentat/2020/Mentat_bin/submit4.patch
index 37069512e..211bf1e83 100644
--- a/install/MarcMentat/2020/Mentat_bin/submit4.patch
+++ b/install/MarcMentat/2020/Mentat_bin/submit4.patch
@@ -1,15 +1,5 @@
 --- 
 +++ 
-@@ -4,7 +4,8 @@
- # Normal exit status is 0.
- #
- 
--DIR=/tmp/msc/marc2020
-+DIR=%INSTALLDIR%/marc2020
-+
- if test $MARCDIR1
- then
-  DIR=$MARCDIR1
 @@ -59,10 +60,10 @@
  if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then
    slv="-iam sfm"
diff --git a/install/MarcMentat/2020/Mentat_bin/submit5.patch b/install/MarcMentat/2020/Mentat_bin/submit5.patch
index b13106394..e882ea1e2 100644
--- a/install/MarcMentat/2020/Mentat_bin/submit5.patch
+++ b/install/MarcMentat/2020/Mentat_bin/submit5.patch
@@ -1,15 +1,5 @@
 --- 
 +++ 
-@@ -4,7 +4,8 @@
- # Normal exit status is 0.
- #
- 
--DIR=/tmp/msc/marc2020
-+DIR=%INSTALLDIR%/marc2020
-+
- if test $MARCDIR1
- then
-  DIR=$MARCDIR1
 @@ -59,10 +60,10 @@
  if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then
    slv="-iam sfm"
diff --git a/install/MarcMentat/2020/Mentat_bin/submit6.patch b/install/MarcMentat/2020/Mentat_bin/submit6.patch
index 820822b34..b4e01eb81 100644
--- a/install/MarcMentat/2020/Mentat_bin/submit6.patch
+++ b/install/MarcMentat/2020/Mentat_bin/submit6.patch
@@ -1,15 +1,5 @@
 --- 
 +++ 
-@@ -4,7 +4,8 @@
- # Normal exit status is 0.
- #
- 
--DIR=/tmp/msc/marc2020
-+DIR=%INSTALLDIR%/marc2020
-+
- if test $MARCDIR1
- then
-  DIR=$MARCDIR1
 @@ -59,10 +60,10 @@
  if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then
    slv="-iam sfm"
diff --git a/install/MarcMentat/2021.2/Mentat_bin/submit4.patch b/install/MarcMentat/2021.2/Mentat_bin/submit4.patch
index 874df90d5..211bf1e83 100644
--- a/install/MarcMentat/2021.2/Mentat_bin/submit4.patch
+++ b/install/MarcMentat/2021.2/Mentat_bin/submit4.patch
@@ -1,15 +1,5 @@
 --- 
 +++ 
-@@ -4,7 +4,8 @@
- # Normal exit status is 0.
- #
- 
--DIR=/nethome/f.roters/temp/msc/Marc2021.2/marc2021.2
-+DIR=%INSTALLDIR%/marc2021.2
-+
- if test $MARCDIR1
- then
-  DIR=$MARCDIR1
 @@ -59,10 +60,10 @@
  if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then
    slv="-iam sfm"
diff --git a/install/MarcMentat/2021.2/Mentat_bin/submit5.patch b/install/MarcMentat/2021.2/Mentat_bin/submit5.patch
index c43a02469..e882ea1e2 100644
--- a/install/MarcMentat/2021.2/Mentat_bin/submit5.patch
+++ b/install/MarcMentat/2021.2/Mentat_bin/submit5.patch
@@ -1,15 +1,5 @@
 --- 
 +++ 
-@@ -4,7 +4,8 @@
- # Normal exit status is 0.
- #
- 
--DIR=/nethome/f.roters/temp/msc/Marc2021.2/marc2021.2
-+DIR=%INSTALLDIR%/marc2021.2
-+
- if test $MARCDIR1
- then
-  DIR=$MARCDIR1
 @@ -59,10 +60,10 @@
  if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then
    slv="-iam sfm"
diff --git a/install/MarcMentat/2021.2/Mentat_bin/submit6.patch b/install/MarcMentat/2021.2/Mentat_bin/submit6.patch
index e12e27f8b..b4e01eb81 100644
--- a/install/MarcMentat/2021.2/Mentat_bin/submit6.patch
+++ b/install/MarcMentat/2021.2/Mentat_bin/submit6.patch
@@ -1,15 +1,5 @@
 --- 
 +++ 
-@@ -4,7 +4,8 @@
- # Normal exit status is 0.
- #
- 
--DIR=/nethome/f.roters/temp/msc/Marc2021.2/marc2021.2
-+DIR=%INSTALLDIR%/marc2021.2
-+
- if test $MARCDIR1
- then
-  DIR=$MARCDIR1
 @@ -59,10 +60,10 @@
  if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then
    slv="-iam sfm"
diff --git a/install/MarcMentat/2021.3.1/Mentat_bin/submit4.patch b/install/MarcMentat/2021.3.1/Mentat_bin/submit4.patch
index 19a0e14f6..5959fc085 100644
--- a/install/MarcMentat/2021.3.1/Mentat_bin/submit4.patch
+++ b/install/MarcMentat/2021.3.1/Mentat_bin/submit4.patch
@@ -1,15 +1,5 @@
 ---
 +++
-@@ -4,7 +4,8 @@
- # Normal exit status is 0.
- #
- 
--DIR=/nethome/f.roters/temp/msc/Marc2021.3.1/marc2021.3.1
-+DIR=%INSTALLDIR%/marc2021.3.1
-+
- if test $MARCDIR1
- then
-  DIR=$MARCDIR1
 @@ -60,10 +61,10 @@ gpu=$3
  if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then
    slv="-iam sfm"
diff --git a/install/MarcMentat/2021.3.1/Mentat_bin/submit5.patch b/install/MarcMentat/2021.3.1/Mentat_bin/submit5.patch
index cb0132fbd..94049222b 100644
--- a/install/MarcMentat/2021.3.1/Mentat_bin/submit5.patch
+++ b/install/MarcMentat/2021.3.1/Mentat_bin/submit5.patch
@@ -1,15 +1,5 @@
 ---
 +++
-@@ -4,7 +4,8 @@
- # Normal exit status is 0.
- #
- 
--DIR=/nethome/f.roters/temp/msc/Marc2021.3.1/marc2021.3.1
-+DIR=%INSTALLDIR%/marc2021.3.1
-+
- if test $MARCDIR1
- then
-  DIR=$MARCDIR1
 @@ -60,10 +61,10 @@ gpu=$3
  if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then
    slv="-iam sfm"
diff --git a/install/MarcMentat/2021.3.1/Mentat_bin/submit6.patch b/install/MarcMentat/2021.3.1/Mentat_bin/submit6.patch
index c30209067..f248ec5fd 100644
--- a/install/MarcMentat/2021.3.1/Mentat_bin/submit6.patch
+++ b/install/MarcMentat/2021.3.1/Mentat_bin/submit6.patch
@@ -1,15 +1,5 @@
 ---
 +++
-@@ -4,7 +4,8 @@
- # Normal exit status is 0.
- #
- 
--DIR=/nethome/f.roters/temp/msc/Marc2021.3.1/marc2021.3.1
-+DIR=%INSTALLDIR%/marc2021.3.1
-+
- if test $MARCDIR1
- then
-  DIR=$MARCDIR1
 @@ -60,10 +61,10 @@ gpu=$3
  if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then
    slv="-iam sfm"
diff --git a/install/MarcMentat/apply_DAMASK_modifications.py b/install/MarcMentat/apply_DAMASK_modifications.py
index 60184bafa..0f99fb78f 100755
--- a/install/MarcMentat/apply_DAMASK_modifications.py
+++ b/install/MarcMentat/apply_DAMASK_modifications.py
@@ -15,8 +15,7 @@ def copy_and_patch(patch,orig,marc_root,editor):
         pass
     damask.util.run(f'patch {orig.parent/patch.stem} {patch} -b')
     with open(orig.parent/patch.stem) as f_in, open(orig.parent/patch.stem,'w') as f_out:
-        content = f_in.read()
-        f_out.write(content.replace('%INSTALLDIR%',f'{marc_root}').replace('%EDITOR%',editor))
+        f_out.write(f_in.read().replace('%EDITOR%',editor))
 
 
 parser = argparse.ArgumentParser(