From 27ea5d3ebeb0ce255ed4ee91b5777eb2c79d2623 Mon Sep 17 00:00:00 2001 From: Daniel Frank Date: Sun, 18 Aug 2019 13:15:52 +0200 Subject: [PATCH] build.sh: some cleanup with shellcheck (cherry picked from commit cfebeb94b5b044dc1ae38529482cb0833a2e6838) --- build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 3d3aae8..ce00e05 100755 --- a/build.sh +++ b/build.sh @@ -72,6 +72,7 @@ announce GLUON: "$gluon_path" >&2 announce FFHH SITE PATH: "$site_path" >&2 pushd "$site_path" +# shellcheck source=/dev/null . ./build.conf [ "${GLUON_BRANCH}" = "experimental" ] && GLUON_RELEASE="${GLUON_RELEASE}~exp$(date +%Y%m%d)" export GLUON_RELEASE @@ -114,7 +115,8 @@ for broken_image in "${broken_images[@]}"; do find "${GLUON_OUTPUTDIR}/images" -iname "${broken_image}" \( -type f -o -type l \) -ls -exec rm -f {} \; done # Generate the images.list -( cd "${GLUON_OUTPUTDIR}/images" && ( find -type f ! -iname '*.manifest' ! -iname images.list; find -type l ! -iname '*.manifest' ) | sed -e 's!^\./\(.*\)$!\1!' -e 's!/! !g' | sort > images.list ) +# shellcheck disable=SC2094 +( cd "${GLUON_OUTPUTDIR}/images" && ( find . -type f ! -iname '*.manifest' ! -iname images.list; find . -type l ! -iname '*.manifest' ) | sed -e 's!^\./\(.*\)$!\1!' -e 's!/! !g' | sort > images.list ) announce Building manifest... make manifest if [ -n "${signature}" ]; then