mirror of
https://github.com/searxng/searxng.git
synced 2024-11-05 09:00:02 +00:00
[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 <markus.heiser@darmarit.de>
This commit is contained in:
parent
e62733fcf3
commit
c89d2aab3f
1 changed files with 16 additions and 10 deletions
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue