merge: Integrate v2.1 progress into public repository

This pull request integrates the changes planned for the v2.1 release of
OpenDC into the public Github repository in order to sync the progress
of both repositories.

2 files changed, 14 insertions, 19 deletions

diff --git a/opendc-web/opendc-web-ui/scripts/envsubst-html.sh b/opendc-web/opendc-web-ui/scripts/envsubst-html.sh
deleted file mode 100755
index 8ca12e8a..00000000
--- a/opendc-web/opendc-web-ui/scripts/envsubst-html.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# We can use simple version of envsubst execution as
-# envsubst < /usr/share/nginx/html/index.html.template > /usr/share/nginx/html/index.html
-# but it replaces everything that looks like environment variable substitution
-# so it affects `default values` approach.
-# we need to replace only provided environment variables.
-
-auto_envsubst() {
-  template_path="/usr/share/nginx/html/index.html.template"
-  output_path="/usr/share/nginx/html/index.html"
-  defined_envs=$(printf '${%s} ' $(env | cut -d= -f1))
-  envsubst "$defined_envs" < "$template_path" > "$output_path"
-}
-
-auto_envsubst
-exit 0
diff --git a/opendc-web/opendc-web-ui/scripts/envsubst.sh b/opendc-web/opendc-web-ui/scripts/envsubst.sh
new file mode 100755
index 00000000..d7ae9ecb
--- /dev/null
+++ b/opendc-web/opendc-web-ui/scripts/envsubst.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+auto_envsubst() {
+    input_path="/opendc/.next.template"
+    output_path="/opendc/.next"
+
+    cp -r "$input_path" "$output_path"
+    find "$output_path" -type f -name '*.js' -exec perl -pi -e 's/%%(NEXT_PUBLIC_[_A-Z0-9]+)%%/$ENV{$1}/g' {} \;
+}
+
+auto_envsubst
+exit 0