[incubator-ponymail-foal] branch master updated: Try to minimise unnecessary updates

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git


The following commit(s) were added to refs/heads/master by this push:
     new 110d9d9  Try to minimise unnecessary updates
110d9d9 is described below

commit 110d9d970b9bb3bb56463967e12c20ed370e6c35
Author: Sebb <s...@apache.org>
AuthorDate: Mon Nov 22 12:43:58 2021 +0000

    Try to minimise unnecessary updates
    
    Derive change hash from source files only
---
 webui/js/source/build.sh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/webui/js/source/build.sh b/webui/js/source/build.sh
index 0a9917e..2375696 100755
--- a/webui/js/source/build.sh
+++ b/webui/js/source/build.sh
@@ -5,7 +5,12 @@ cd $(dirname "$0") || exit 1
 
 test -r build.sh || { echo "Must be run from the directory containing 
build.sh!"; exit 1; }
 
-REVISION=`git rev-parse --short HEAD`
+# Javascript revision (for updating HTML)
+JS_REV=$(git log -1 --pretty=%h -- ..)
+
+# Javascript source revision (for creating ponymail.js)
+JS_SRCR_EV=$(git log -1 --pretty=%h -- .)
+
 echo "Combining JS..."
 echo '/*
  Licensed to the Apache Software Foundation (ASF) under one or more
@@ -25,7 +30,7 @@ echo '/*
 */
 // THIS IS AN AUTOMATICALLY COMBINED FILE. PLEASE EDIT source/*.js!!
 
-const PONYMAIL_REVISION = "'$REVISION'";
+const PONYMAIL_REVISION = "'$JS_SRC_REV'";
 ' > ../ponymail.js
 for f in `ls *.js`; do
     printf "\n\n/******************************************\n Fetched from 
source/${f}\n******************************************/\n\n" >> ../ponymail.js
@@ -35,7 +40,9 @@ done
 # Adjust JS caches in .html
 for f in `ls ../../*.html`; do
     echo ${f}
-    perl -0pe 's/\?revision=[a-f0-9]+/?revision='${REVISION}'/smg' ${f} > 
${f}.tmp && mv ${f}.tmp ${f}
+    perl -0pe 's/\?revision=[a-f0-9]+/?revision='${JS_REV}'/smg' ${f} > 
${f}.tmp && mv ${f}.tmp ${f}
 done
+
+git status
 echo "Done!"