leave installdir alone

This commit is contained in:
Martin Diehl 2021-11-30 17:46:50 +01:00
parent 98491c61c8
commit 4ac2056dff
10 changed files with 1 additions and 92 deletions

View File

@ -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 @@ @@ -59,10 +60,10 @@
if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then
slv="-iam sfm" slv="-iam sfm"

View File

@ -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 @@ @@ -59,10 +60,10 @@
if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then
slv="-iam sfm" slv="-iam sfm"

View File

@ -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 @@ @@ -59,10 +60,10 @@
if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then
slv="-iam sfm" slv="-iam sfm"

View File

@ -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 @@ @@ -59,10 +60,10 @@
if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then
slv="-iam sfm" slv="-iam sfm"

View File

@ -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 @@ @@ -59,10 +60,10 @@
if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then
slv="-iam sfm" slv="-iam sfm"

View File

@ -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 @@ @@ -59,10 +60,10 @@
if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then
slv="-iam sfm" slv="-iam sfm"

View File

@ -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 @@ -60,10 +61,10 @@ gpu=$3
if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then
slv="-iam sfm" slv="-iam sfm"

View File

@ -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 @@ -60,10 +61,10 @@ gpu=$3
if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then
slv="-iam sfm" slv="-iam sfm"

View File

@ -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 @@ -60,10 +61,10 @@ gpu=$3
if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then if [ "$slv" != "" -a "$slv" != "marc" -a "$slv" != "datfit" ]; then
slv="-iam sfm" slv="-iam sfm"

View File

@ -15,8 +15,7 @@ def copy_and_patch(patch,orig,marc_root,editor):
pass pass
damask.util.run(f'patch {orig.parent/patch.stem} {patch} -b') 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: 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(f_in.read().replace('%EDITOR%',editor))
f_out.write(content.replace('%INSTALLDIR%',f'{marc_root}').replace('%EDITOR%',editor))
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(