From efc5cbab197eeac2f10aad1aaf80fd4d416a3bcf Mon Sep 17 00:00:00 2001 From: Peter Willendrup Date: Fri, 12 Jan 2024 11:19:02 +0100 Subject: [PATCH] Drop @@ templatin --- Dockerfile | 4 ++-- McStasScript/configuration.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index a84cda24..a1cb805e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -54,8 +54,8 @@ RUN cd /opt/install && \ # Configure McStasScript for use with installed McStas export MCSTAS_BINDIR=`mcrun --showcfg=bindir` && \ export MCSTAS_COMPDIR=`mcrun --showcfg=resourcedir` && \ - sed -i 's+@MCSTAS_BINDIR@+'"${MCSTAS_BINDIR}"'+g' McStasScript/configuration.yaml && \ - sed -i 's+@MCSTAS_COMPDIR@+'"${MCSTAS_COMPDIR}"'+g' McStasScript/configuration.yaml && \ + sed -i 's+MCSTAS_BINDIR+'"${MCSTAS_BINDIR}"'+g' McStasScript/configuration.yaml && \ + sed -i 's+MCSTAS_COMPDIR+'"${MCSTAS_COMPDIR}"'+g' McStasScript/configuration.yaml && \ find /opt/conda/lib -type d -name mcstasscript -exec cp McStasScript/configuration.yaml \{\} \; && \ # Run mcdoc, installed via conda /opt/conda/bin/mcdoc -i diff --git a/McStasScript/configuration.yaml b/McStasScript/configuration.yaml index 33993f5f..da849534 100644 --- a/McStasScript/configuration.yaml +++ b/McStasScript/configuration.yaml @@ -1,7 +1,7 @@ other: characters_per_line: 85 paths: - mcrun_path: @MCSTAS_BINDIR@/ - mcstas_path: @MCSTAS_COMPDIR@/ - mcxtrace_path: @MCXTRACE_BINDIR@/ - mxrun_path: @MCXTRACE_COMPDIR@/ + mcrun_path: MCSTAS_BINDIR/ + mcstas_path: MCSTAS_COMPDIR/ + mcxtrace_path: MCXTRACE_BINDIR/ + mxrun_path: MCXTRACE_COMPDIR/