Merge pull request #574 from return42/fix-lib_static

Browse Source 
[mod] make static.build.commit more robust
This commit is contained in:
Alexandre Flament 2021-12-04 10:06:57 +01:00 committed by GitHub
commit 33e2599b82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
utils/lib_static.sh
View File

@ -4,16 +4,16 @@
STATIC_BUILD_COMMIT="[build] /static" STATIC_BUILD_COMMIT="[build] /static"
STATIC_BUILT_PATHS=( STATIC_BUILT_PATHS=(
searx/static/themes/oscar/css 'searx/static/themes/oscar/css'
searx/static/themes/oscar/js 'searx/static/themes/oscar/js'
searx/static/themes/oscar/src/generated/pygments-logicodev.less 'searx/static/themes/oscar/src/generated/pygments-logicodev.less'
searx/static/themes/oscar/src/generated/pygments-pointhi.less 'searx/static/themes/oscar/src/generated/pygments-pointhi.less'
searx/static/themes/simple/css 'searx/static/themes/simple/css'
searx/static/themes/simple/js 'searx/static/themes/simple/js'
searx/static/themes/simple/src/generated/pygments.less 'searx/static/themes/simple/src/generated/pygments.less'
searx/static/themes/simple/img 'searx/static/themes/simple/img'
searx/templates/__common__/searxng-wordmark.min.svg 'searx/templates/__common__/searxng-wordmark.min.svg'
searx/templates/simple/icons.html 'searx/templates/simple/icons.html'
) )
static_help(){ static_help(){
@ -112,6 +112,12 @@ static.build.commit() {
git add -v "${built_path}" git add -v "${built_path}"
done 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 # check for modified files that are not staged
if [ -n "$(git diff --name-only)" ]; then if [ -n "$(git diff --name-only)" ]; then
die 42 "themes.all has created files that are not in STATIC_BUILT_PATHS" die 42 "themes.all has created files that are not in STATIC_BUILT_PATHS"