From 9cb2ce39817f521ad497ffffb71ccf609d2d2622 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 14 Jul 2021 18:20:43 +0200 Subject: [PATCH] file rights are inherited from the original file --- install/MarcMentat/apply_DAMASK_modifications.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/install/MarcMentat/apply_DAMASK_modifications.py b/install/MarcMentat/apply_DAMASK_modifications.py index d66c38227..d35c4328a 100755 --- a/install/MarcMentat/apply_DAMASK_modifications.py +++ b/install/MarcMentat/apply_DAMASK_modifications.py @@ -8,7 +8,7 @@ from pathlib import Path import damask -def copy_and_replace(patch,orig,msc_root,editor): +def copy_and_patch(patch,orig,msc_root,editor): try: shutil.copyfile(orig,orig.parent/patch.stem) except shutil.SameFileError: @@ -56,19 +56,10 @@ for directory in glob.glob(str(damask_root/f'install/MarcMentat/{msc_version}/*' dirs = (msc_root/Path(directory)).name.lower().split('_') orig = msc_root/f'{dirs[0]}{msc_version}/{dirs[1]}/{orig}' for patch in glob.glob(f'{directory}/{mods}.patch'): - copy_and_replace(Path(patch),orig,msc_root,editor) + copy_and_patch(Path(patch),orig,msc_root,editor) print('compiling Mentat menu binaries...') executable = msc_root/f'mentat{msc_version}/bin/mentat' menu_file = msc_root/f'mentat{msc_version}/menus/linux64/main.msb' os.system(f'xvfb-run -a {executable} -compile {menu_file}') - - -print('setting file access rights...\n') - -for pattern in [msc_root/f'marc{msc_version}/tools/*damask*', - msc_root/f'mentat{msc_version}/bin/submit?', - msc_root/f'mentat{msc_version}/bin/kill?']: - for f in glob.glob(str(pattern)): - os.chmod(f,0o755)