sermoni

commit 6485aa250151b90bc29eec27a2bc8dbd7d0bd920
parent 3eb118e39ec9c87b22881fae820b0e471eba1eea
Author: Vetle Haflan <vetle.haflan@luxsave.com>
Date:   Thu, 14 May 2020 19:03:50 +0200

Fix the problem with generate.sh

Seems like the confusion here was caused by a minor difference between
bash and sh (or different versions of sh?). Some versions apparently
deletes the contents the file that's the target of the cat heredoc
snippet, while others don't.

To be sure: *Do not write to the same file as the one to read from!*

Closes #9

Diffstat:
M
Dockerfile
 | 
1
-
M
ui/generate.sh
 | 
8
+++++---

2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Dockerfile b/Dockerfile
@@ -8,7 +8,6 @@ COPY . $GOPATH/src/sermoni/
 WORKDIR $GOPATH/src/sermoni/ui/
 RUN npm install; \
     npm run build; \
-    $GOPATH/src/sermoni/ui/generate.sh ; \
     mv $GOPATH/src/sermoni/ui/dist/html.go $GOPATH/src/sermoni/internal/http/
 # Build the sermoni binary
 WORKDIR $GOPATH/src/sermoni/
diff --git a/ui/generate.sh b/ui/generate.sh
@@ -19,8 +19,9 @@ $(cat ./dist/sermoni.js)
 EOF
 
 # html.go for production, ` must be replaced by `+"`"+`
-cp $INDEX_HTML $HTML_GO
-sed -i 's/`/`\+"`"\+`/g' $HTML_GO
+INDEX_HTML_SANITIZED=${INDEX_HTML}_sane
+cp $INDEX_HTML $INDEX_HTML_SANITIZED
+sed -i 's/`/`\+"`"\+`/g' $INDEX_HTML_SANITIZED
 cat <<EOF > $HTML_GO
 // +build PRODUCTION
 
@@ -30,7 +31,8 @@ const PRODUCTION = true;
 
 func getWebsite() []byte {
 	return []byte(\`
-$(cat $HTML_GO)
+$(cat $INDEX_HTML_SANITIZED)
 	\`)
 }
 EOF
+rm $INDEX_HTML_SANITIZED