diff --git a/VERSION.properties b/VERSION.properties
index 8fe4d0b0..292b7b32 100644
--- a/VERSION.properties
+++ b/VERSION.properties
@@ -1,2 +1,2 @@
-client.version=1.14.15
+client.version=1.14.16
server.version=1.12.13
diff --git a/deploy/scripts/deploy_ui.sh b/deploy/scripts/deploy_ui.sh
index 279e2605..a9fa1238 100755
--- a/deploy/scripts/deploy_ui.sh
+++ b/deploy/scripts/deploy_ui.sh
@@ -103,8 +103,9 @@ CADDY_CONFIG_PATH="$(ssh "$REMOTE_HOST" "set -e; \
ROOT_CHECK_OUTPUT="$(ssh "$REMOTE_HOST" "set -euo pipefail; \
cfg='$CADDY_CONFIG_PATH'; \
site='$EXPECTED_CADDY_SITE'; \
- sudo awk -v site=\"\$site\" '
- BEGIN { in_site=0; depth=0; root_line=\"\"; root_lineno=0; have_site=0; }
+ expected_root='$EXPECTED_CADDY_UI_ROOT'; \
+ sudo awk -v site=\"\$site\" -v expected_root=\"\$expected_root\" '
+ BEGIN { in_site=0; depth=0; roots=\"\"; have_site=0; have_expected=0; }
{
line=\$0;
trimmed=line;
@@ -119,9 +120,12 @@ ROOT_CHECK_OUTPUT="$(ssh "$REMOTE_HOST" "set -euo pipefail; \
next;
}
} else {
- if (trimmed ~ /^root[[:space:]]+\\*[[:space:]]+/ && root_line == \"\") {
- root_line=line;
- root_lineno=NR;
+ if (trimmed ~ /^root[[:space:]]+\\*[[:space:]]+/) {
+ root_entry=NR \":\" line;
+ roots = roots (roots == \"\" ? \"\" : \"\\n\") root_entry;
+ if (line ~ expected_root) {
+ have_expected=1;
+ }
}
opens=gsub(/\\{/, \"{\", line);
closes=gsub(/\\}/, \"}\", line);
@@ -136,11 +140,15 @@ ROOT_CHECK_OUTPUT="$(ssh "$REMOTE_HOST" "set -euo pipefail; \
print \"SITE_NOT_FOUND\";
exit 0;
}
- if (root_line == \"\") {
+ if (roots == \"\") {
print \"ROOT_NOT_FOUND\";
exit 0;
}
- print root_lineno \":\" root_line;
+ if (have_expected) {
+ print \"OK\";
+ exit 0;
+ }
+ print roots;
}
' \"\$cfg\"")"
@@ -160,8 +168,9 @@ elif [[ "$ROOT_CHECK_OUTPUT" == "ROOT_NOT_FOUND" ]]; then
exit 1
fi
echo "WARN: proceeding due to ALLOW_CADDY_MISMATCH=1"
-elif [[ "$ROOT_CHECK_OUTPUT" != *"$EXPECTED_CADDY_UI_ROOT"* ]]; then
- echo "ERROR: Caddy root mismatch for site $EXPECTED_CADDY_SITE. Found: $ROOT_CHECK_OUTPUT" >&2
+elif [[ "$ROOT_CHECK_OUTPUT" != "OK" ]]; then
+ echo "ERROR: Caddy root mismatch for site $EXPECTED_CADDY_SITE. Found roots:" >&2
+ echo "$ROOT_CHECK_OUTPUT" >&2
echo "Caddy config: $CADDY_CONFIG_PATH" >&2
echo "Expected path fragment: $EXPECTED_CADDY_UI_ROOT" >&2
if [[ "$ALLOW_CADDY_MISMATCH" != "1" ]]; then
diff --git a/shine-UI/img/pwa-icon-192.png b/shine-UI/img/pwa-icon-192.png
new file mode 100644
index 00000000..c0dc2d37
Binary files /dev/null and b/shine-UI/img/pwa-icon-192.png differ
diff --git a/shine-UI/img/pwa-icon-512.png b/shine-UI/img/pwa-icon-512.png
new file mode 100644
index 00000000..9bea9771
Binary files /dev/null and b/shine-UI/img/pwa-icon-512.png differ
diff --git a/shine-UI/img/pwa-icon-maskable-512.png b/shine-UI/img/pwa-icon-maskable-512.png
new file mode 100644
index 00000000..07e0cbae
Binary files /dev/null and b/shine-UI/img/pwa-icon-maskable-512.png differ
diff --git a/shine-UI/index.html b/shine-UI/index.html
index 92ffb74f..ad0b1b8d 100644
--- a/shine-UI/index.html
+++ b/shine-UI/index.html
@@ -39,7 +39,7 @@
}());