Drop @@ templatin

McStasMcXtrace · Jan 12, 2024 · efc5cba · efc5cba
1 parent f8e3c75
commit efc5cba
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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/