[gimp/wip/schumaml/crossraods-optimization: 56/57] gitlab-ci: adjust / to \ replacement expression in loaders.cache step




commit b868333ef7b28e379aa24237a7589a1525125cc0
Author: Michael Schumacher <schumaml gmx de>
Date:   Mon Dec 7 18:30:00 2020 +0100

    gitlab-ci: adjust / to \ replacement expression in loaders.cache step

 build/docker/CI/Dockerfile.win64 | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/build/docker/CI/Dockerfile.win64 b/build/docker/CI/Dockerfile.win64
index d71a7871b0..a37c3487e6 100644
--- a/build/docker/CI/Dockerfile.win64
+++ b/build/docker/CI/Dockerfile.win64
@@ -13,9 +13,9 @@ RUN git clone --depth=1 git://git.tuxfamily.org/gitroot/crossroad/crossroad.git
 RUN cd crossroad && ./setup.py install --prefix=/usr/local && cd ..
 
 # install babl and GEGL dependencies with crossroad
-RUN echo "export XDG_DATA_HOME=$XDG_DATA_HOME && \
+RUN echo 'export XDG_DATA_HOME=$XDG_DATA_HOME && \
     crossroad source msys2 && crossroad install lcms2 cairo json-glib' | \
-    XDG_DATA_HOME=$XDG_DATA_HOME crossroad w64 gimp --run='-'"
+    XDG_DATA_HOME=$XDG_DATA_HOME crossroad w64 gimp --run='-'
 
 # install GIMP dependencies with crossroad
 RUN echo 'export XDG_DATA_HOME=$XDG_DATA_HOME && crossroad source msys2 && \
@@ -32,9 +32,10 @@ RUN echo 'export XDG_DATA_HOME=/usr/local/lib && \
     XDG_DATA_HOME=$XDG_DATA_HOME crossroad w64 gimp --run='-'
 
 # loaders.cache cleanup
-RUN echo 'sed -i "s&${XDG_DATA_HOME}/crossroad/roads/w64/gimp/&&" \
-    ${XDG_DATA_HOME}/crossroad/roads/w64/gimp/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache' | \
-    XDG_DATA_HOME=$XDG_DATA_HOME crossroad w64 gimp --run='-'
+# remove the absolute part of the paths
+RUN sed -i 's&${XDG_DATA_HOME}/crossroad/roads/w64/gimp/&&' \
+    ${XDG_DATA_HOME}/crossroad/roads/w64/gimp/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
 
-RUN echo 'sed -i "/.dll\"/s*/*\\\\*g" 
${XDG_DATA_HOME}/crossroad/roads/w64/gimp/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache' | \
-    XDG_DATA_HOME=$XDG_DATA_HOME crossroad w64 gimp --run='-'
\ No newline at end of file
+# replace / by \ in lines which match '.dll"'
+RUN sed -i '/.dll"/s*/*\\*g' \
+    ${XDG_DATA_HOME}/crossroad/roads/w64/gimp/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
\ No newline at end of file


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]