github-com-docker-mailserver/docker-mailserver
1
0
Fork 0
mirror of https://github.com/docker-mailserver/docker-mailserver.git synced 2024-01-19 02:48:50 +00:00
Code Issues Projects Releases Wiki Activity

scripts: introduce _log to sedfile (#2507)

Browse source
This commit is contained in:
Georg Lauterbach 2022-04-02 15:52:30 +02:00 committed by GitHub
parent 05f680b472
commit a1ecd781c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Dockerfile
View file

@ -85,6 +85,7 @@ RUN \
rm -rf /var/lib/apt/lists/* && \ rm -rf /var/lib/apt/lists/* && \
c_rehash 2>&1 c_rehash 2>&1
COPY ./target/scripts/helpers/log.sh /usr/local/bin/helpers/log.sh
COPY ./target/bin/sedfile /usr/local/bin/sedfile COPY ./target/bin/sedfile /usr/local/bin/sedfile
RUN chmod +x /usr/local/bin/sedfile RUN chmod +x /usr/local/bin/sedfile

16
target/bin/sedfile
View file

@ -9,6 +9,17 @@
# Is a file change expected? --> use 'sedfile --strict -i' # Is a file change expected? --> use 'sedfile --strict -i'
# Is a file change only on the first container run expected? --> use 'sedfile -i' # Is a file change only on the first container run expected? --> use 'sedfile -i'
if [[ -e /usr/local/bin/helpers/log.sh ]]
then
# shellcheck source=../scripts/helpers/log.sh
source /usr/local/bin/helpers/log.sh
else
# when running BATS (unit tests), this file is not located
# inside a container; as a consequence, we need to source
# from a different location
source target/scripts/helpers/log.sh
fi
set -ueo pipefail set -ueo pipefail
function __usage { echo "Usage: ${0} -i <replace/delete operation> <file>" ; } function __usage { echo "Usage: ${0} -i <replace/delete operation> <file>" ; }
@ -18,9 +29,8 @@ SKIP_ERROR=0
if [[ ${#} -lt 3 ]] if [[ ${#} -lt 3 ]]
then then
echo 'Error: At least three parameters must be given' _log 'error' 'At least three parameters must be given'
__usage __usage
echo
exit 1 exit 1
fi >&2 fi >&2
@ -41,7 +51,7 @@ NEW=$(${HASHTOOL} "${FILE}")
# fail if file was not modified # fail if file was not modified
if [[ ${OLD} == "${NEW}" ]] && [[ ${SKIP_ERROR} -eq 0 ]] if [[ ${OLD} == "${NEW}" ]] && [[ ${SKIP_ERROR} -eq 0 ]]
then then
echo "Error: No difference after call to 'sed' in 'sedfile' (sed ${*})" >&2 _log 'error' "No difference after call to 'sed' in 'sedfile' (sed ${*})" >&2
exit 1 exit 1
fi fi

6
test/sedfile.bats
View file

@ -18,7 +18,7 @@ function setup_file() {
@test "checking sedfile parameter count" { @test "checking sedfile parameter count" {
run ${SEDFILE} run ${SEDFILE}
assert_failure assert_failure
assert_output --partial 'Error: At least three parameters must be given' assert_output --partial 'At least three parameters must be given'
} }
@test "checking sedfile substitute success" { @test "checking sedfile substitute success" {
@ -35,7 +35,7 @@ function setup_file() {
@test "checking sedfile substitute failure" { @test "checking sedfile substitute failure" {
run ${SEDFILE} -i 's|bar|baz|' "${FILE}" run ${SEDFILE} -i 's|bar|baz|' "${FILE}"
assert_failure assert_failure
assert_output --partial "Error: No difference after call to 'sed' in 'sedfile' (sed -i s|bar|baz| /tmp/sedfile-test" assert_output --partial "No difference after call to 'sed' in 'sedfile' (sed -i s|bar|baz| /tmp/sedfile-test"
# file unchanged? # file unchanged?
run test "$(< "${FILE}")" == 'foo baz' run test "$(< "${FILE}")" == 'foo baz'
@ -58,7 +58,7 @@ function setup_file() {
@test "checking sedfile substitude failure (strict)" { @test "checking sedfile substitude failure (strict)" {
run ${SEDFILE} --strict -i 's|bar|baz|' "${FILE}" run ${SEDFILE} --strict -i 's|bar|baz|' "${FILE}"
assert_failure assert_failure
assert_output --partial "Error: No difference after call to 'sed' in 'sedfile' (sed -i s|bar|baz| /tmp/sedfile-test" assert_output --partial "No difference after call to 'sed' in 'sedfile' (sed -i s|bar|baz| /tmp/sedfile-test"
# file unchanged? # file unchanged?
run test "$(< "${FILE}")" == 'foo baz' run test "$(< "${FILE}")" == 'foo baz'