From: marc tobias <mtmail@gmx.net>
Date: Sat, 30 Nov 2019 19:36:05 +0000 (+0100)
Subject: use shell to insert templates in layout, not Perl. One less dependency
X-Git-Url: https://git.openstreetmap.org/nominatim-ui.git/commitdiff_plain/ee2a52b1f14aabb89f1743711cdd8d2476de4c06

use shell to insert templates in layout, not Perl. One less dependency
---

diff --git a/build.sh b/build.sh
index 50bf400..f77b8a3 100755
--- a/build.sh
+++ b/build.sh
@@ -28,9 +28,31 @@ rsync --quiet src/templates/*.hbs dist/
 rsync --quiet src/*.js dist/
 
 
-cat src/layout.html | perl -pe'use File::Slurper qw(read_text); s/\@include\((.+?)\)/read_text($1)/eg' > /tmp/included.html
+# replaced the Perl one-liner with shell logic to remove the dependency
+# cat src/layout.html | perl -pe'use File::Slurper qw(read_text); s/\@include\((.+?)\)/read_text($1)/eg' > /tmp/included.html
+
+cat src/layout.html | grep -v '</body>' | grep -v '</html>' | sed -e 's/BODYID/search-page/' > dist/search.html
+echo '<script id="searchpage-template" type="text/x-handlebars-template">' >> dist/search.html
+cat src/templates/searchpage.hbs >> dist/search.html
+echo '</script>' >> dist/search.html
+echo '</body>' >> dist/search.html
+echo '</html>' >> dist/search.html
+
+cat src/layout.html | grep -v '</body>' | grep -v '</html>' | sed -e 's/BODYID/reverse-page/' > dist/reverse.html
+echo '<script id="reversepage-template" type="text/x-handlebars-template">' >> dist/reverse.html
+cat src/templates/reversepage.hbs >> dist/reverse.html
+echo '</script>' >> dist/reverse.html
+echo '</body>' >> dist/reverse.html
+echo '</html>' >> dist/reverse.html
+
+cat src/layout.html | grep -v '</body>' | grep -v '</html>' | sed -e 's/BODYID/details-page/' > dist/details.html
+echo '<script id="detailspage-template" type="text/x-handlebars-template">' >> dist/details.html
+cat src/templates/detailspage.hbs >> dist/details.html
+echo '</script>' >> dist/details.html
+echo '<script id="detailspage-index-template" type="text/x-handlebars-template">' >> dist/details.html
+cat src/templates/detailspage-index.hbs >> dist/details.html
+echo '</script>' >> dist/details.html
+echo '</body>' >> dist/details.html
+echo '</html>' >> dist/details.html
 
-cat /tmp/included.html | perl -pe's/BODYID/search-page/g' > dist/search.html
-cat /tmp/included.html | perl -pe's/BODYID/reverse-page/g' > dist/reverse.html
-cat /tmp/included.html | perl -pe's/BODYID/details-page/g' > dist/details.html
 cp src/index.html dist/
diff --git a/src/layout.html b/src/layout.html
index 42a23a4..5431dc6 100644
--- a/src/layout.html
+++ b/src/layout.html
@@ -111,19 +111,6 @@
 
   <script src="config.js"></script>
   <script src="handlebar_helpers.js"></script>
-  <script id="searchpage-template" type="text/x-handlebars-template">
-    @include(src/templates/searchpage.hbs)
-  </script>
-  <script id="reversepage-template" type="text/x-handlebars-template">
-    @include(src/templates/reversepage.hbs)
-  </script>
-  <script id="detailspage-template" type="text/x-handlebars-template">
-    @include(src/templates/detailspage.hbs)
-  </script>
-  <script id="detailspage-index-template" type="text/x-handlebars-template">
-    @include(src/templates/detailspage-index.hbs)
-  </script>
-
 
   <script src="assets/js/nominatim-ui.js"></script>
 </body>