From 69d5c58a5b6c10dbbac232e3f3c2e90aa87755cf Mon Sep 17 00:00:00 2001 From: Florian Schlichting Date: Tue, 4 Oct 2022 09:41:09 +0200 Subject: [PATCH] switch egrep to grep -E to avoid test failure 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... --- dba/create-database.sh | 2 +- scripts/po/rebuild-translations.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dba/create-database.sh b/dba/create-database.sh index 48e22bd1..b48e37e6 100755 --- a/dba/create-database.sh +++ b/dba/create-database.sh @@ -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 diff --git a/scripts/po/rebuild-translations.sh b/scripts/po/rebuild-translations.sh index d8023f9b..01edd402 100755 --- a/scripts/po/rebuild-translations.sh +++ b/scripts/po/rebuild-translations.sh @@ -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