nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-03-13 08:00:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

switch egrep to grep -E to avoid test failure

Browse Source 
this is https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1019335, which
should be fixed but apparently isn't in the image we're using...
This commit is contained in:
Florian Schlichting 2022-10-04 09:41:09 +02:00
parent f44a996432
commit 69d5c58a5b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dba/create-database.sh
View File

@ -150,7 +150,7 @@ EOFAILURE
fi
#
# Load the required base data
psql -qXAt ${PSQLOPTS} ${DBA} -f "${DBADIR}/base-data.sql" "${DBNAME}" | egrep -v '^10'
psql -qXAt ${PSQLOPTS} ${DBA} -f "${DBADIR}/base-data.sql" "${DBNAME}" | grep -E -v '^10'
#
# We can override the admin password generation for regression testing predictability

2
scripts/po/rebuild-translations.sh
View File

@ -34,7 +34,7 @@ if [ -z "${AWL_LOCATION}" ] ; then
exit 1
fi
egrep -l '(i18n|translate)' htdocs/*.php inc/*.php inc/ui/*.php > ${PODIR}/pofilelist.tmp1
grep -E -l '(i18n|translate)' htdocs/*.php inc/*.php inc/ui/*.php > ${PODIR}/pofilelist.tmp1
sed "s:../awl:${AWL_LOCATION}:" ${PODIR}/pofilelist.txt >> ${PODIR}/pofilelist.tmp1
sort ${PODIR}/pofilelist.tmp1 | uniq > ${PODIR}/pofilelist.tmp
xgettext --from-code=UTF-8 --no-location --add-comments=Translators --keyword=translate --keyword=i18n --output=${PODIR}/messages.tmp -s -f ${PODIR}/pofilelist.tmp