From c26bd6e82c3ed7e6337f58aa03f7aa5833580f1f Mon Sep 17 00:00:00 2001 From: Franz Roters Date: Mon, 29 Nov 2021 14:35:45 +0100 Subject: [PATCH] correct path; error correctionin mod script --- .../2021.3.1/{Mentat_menues => Mentat_menus}/job_run.ms.patch | 0 install/MarcMentat/apply_DAMASK_modifications.py | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename install/MarcMentat/2021.3.1/{Mentat_menues => Mentat_menus}/job_run.ms.patch (100%) diff --git a/install/MarcMentat/2021.3.1/Mentat_menues/job_run.ms.patch b/install/MarcMentat/2021.3.1/Mentat_menus/job_run.ms.patch similarity index 100% rename from install/MarcMentat/2021.3.1/Mentat_menues/job_run.ms.patch rename to install/MarcMentat/2021.3.1/Mentat_menus/job_run.ms.patch diff --git a/install/MarcMentat/apply_DAMASK_modifications.py b/install/MarcMentat/apply_DAMASK_modifications.py index bf1783e5f..a8e56139c 100755 --- a/install/MarcMentat/apply_DAMASK_modifications.py +++ b/install/MarcMentat/apply_DAMASK_modifications.py @@ -17,7 +17,7 @@ def copy_and_patch(patch,orig,marc_root,editor): with open(orig.parent/patch.stem) as f_in: content = f_in.read() with open(orig.parent/patch.stem,'w') as f_out: - f_out.write(content.replace('%INSTALLDIR%',marc_root).replace('%EDITOR%',editor)) + f_out.write(content.replace('%INSTALLDIR%',f'{marc_root}').replace('%EDITOR%',editor)) parser = argparse.ArgumentParser(