From c89d2aab3fe4b13dbab98e9b03d3d10de16fac3e Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Wed, 1 Dec 2021 20:25:39 +0100 Subject: [PATCH] [mod] make static.build.commit more robust - use single quote in the STATIC_BUILT_PATHS to avoid bash globbing - don't try to commit if no files have been changed Signed-off-by: Markus Heiser --- utils/lib_static.sh | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/utils/lib_static.sh b/utils/lib_static.sh index 785bb2687..2a5efeda0 100755 --- a/utils/lib_static.sh +++ b/utils/lib_static.sh @@ -4,16 +4,16 @@ STATIC_BUILD_COMMIT="[build] /static" STATIC_BUILT_PATHS=( - searx/static/themes/oscar/css - searx/static/themes/oscar/js - searx/static/themes/oscar/src/generated/pygments-logicodev.less - searx/static/themes/oscar/src/generated/pygments-pointhi.less - searx/static/themes/simple/css - searx/static/themes/simple/js - searx/static/themes/simple/src/generated/pygments.less - searx/static/themes/simple/img - searx/templates/__common__/searxng-wordmark.min.svg - searx/templates/simple/icons.html + 'searx/static/themes/oscar/css' + 'searx/static/themes/oscar/js' + 'searx/static/themes/oscar/src/generated/pygments-logicodev.less' + 'searx/static/themes/oscar/src/generated/pygments-pointhi.less' + 'searx/static/themes/simple/css' + 'searx/static/themes/simple/js' + 'searx/static/themes/simple/src/generated/pygments.less' + 'searx/static/themes/simple/img' + 'searx/templates/__common__/searxng-wordmark.min.svg' + 'searx/templates/simple/icons.html' ) static_help(){ @@ -112,6 +112,12 @@ static.build.commit() { git add -v "${built_path}" done + # check if any file has been added (in case of no changes) + if [ -z "$(git diff --name-only --cached)" ]; then + build_msg STATIC "no changes applied / nothing to commit" + return 0 + fi + # check for modified files that are not staged if [ -n "$(git diff --name-only)" ]; then die 42 "themes.all has created files that are not in STATIC_BUILT_PATHS"