From 0705657747e31a0884ee7268515f04ee2684ae8e Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 14 Apr 2020 18:42:59 +0200 Subject: [PATCH] build: luci.mk: gracefully handle missing or unversioned po subdirectories Fixes: #3911 Fixes: 9d8e99f9b build: gracefully handle non-Git source trees Signed-off-by: Jo-Philipp Wich --- luci.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/luci.mk b/luci.mk index 621008aa8..0b3a66e3b 100644 --- a/luci.mk +++ b/luci.mk @@ -65,9 +65,13 @@ define findrev $(shell \ if git log -1 >/dev/null 2>/dev/null; then \ set -- $$(git log -1 --format="%ct %h" --abbrev=7 -- '$(if $(1),:(exclude))po'); \ - secs="$$(($$1 % 86400))"; \ - yday="$$(date --utc --date="@$$1" "+%y.%j")"; \ - printf 'git-%s.%05d-%s' "$$yday" "$$secs" "$$2"; \ + if [ -n "$$1" ]; then + secs="$$(($$1 % 86400))"; \ + yday="$$(date --utc --date="@$$1" "+%y.%j")"; \ + printf 'git-%s.%05d-%s' "$$yday" "$$secs" "$$2"; \ + else \ + echo "unknown"; \ + fi; \ else \ ts=$$(find . -type f $(if $(1),-not) -path './po/*' -printf '%T@\n' 2>/dev/null | sort -rn | head -n1 | cut -d. -f1); \ if [ -n "$$ts" ]; then \ -- 2.25.1