From 943372ac70a19ef89b8ea6fc3014e743516a9861 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20=C5=A0urda?= Date: Tue, 20 Sep 2022 18:36:13 +0800 Subject: [PATCH] Use whitespace match in sed - it looks like sometimes the config.h uses a space and sometimes a tab --- buildbot/buildbot_steps.sh | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/buildbot/buildbot_steps.sh b/buildbot/buildbot_steps.sh index efd1428..50f90a8 100755 --- a/buildbot/buildbot_steps.sh +++ b/buildbot/buildbot_steps.sh @@ -28,25 +28,25 @@ function sed_enabled_ipxe_features() { return 1 fi - sed -i 's/^\/\/\#define\ DOWNLOAD_PROTO_HTTPS/\#define\ DOWNLOAD_PROTO_HTTPS/g' "${ipxe_src_dir}/src/config/general.h" - sed -i 's/^\/\/\#define\ NSLOOKUP_CMD/\#define\ NSLOOKUP_CMD/g' "${ipxe_src_dir}/src/config/general.h" - sed -i 's/^\/\/\#define\ TIME_CMD/\#define\ TIME_CMD/g' "${ipxe_src_dir}/src/config/general.h" - sed -i 's/^\/\/\#define\ DIGEST_CMD/\#define\ DIGEST_CMD/g' "${ipxe_src_dir}/src/config/general.h" - sed -i 's/^\/\/\#define\ REBOOT_CMD/\#define\ REBOOT_CMD/g' "${ipxe_src_dir}/src/config/general.h" - sed -i 's/^\/\/\#define\ POWEROFF_CMD/\#define\ POWEROFF_CMD/g' "${ipxe_src_dir}/src/config/general.h" - sed -i 's/^\/\/\#define\ IMAGE_TRUST_CMD/\#define\ IMAGE_TRUST_CMD/g' "${ipxe_src_dir}/src/config/general.h" - sed -i 's/^\/\/\#define\ NTP_CMD/\#define\ NTP_CMD/g' "${ipxe_src_dir}/src/config/general.h" - sed -i 's/^\/\/\#define\ CERT_CMD/\#define\ CERT_CMD/g' "${ipxe_src_dir}/src/config/general.h" + sed -ei 's/^\/\/\#define[[:space:]]+DOWNLOAD_PROTO_HTTPS/\#define\ DOWNLOAD_PROTO_HTTPS/g' "${ipxe_src_dir}/src/config/general.h" + sed -ei 's/^\/\/\#define[[:space:]]+NSLOOKUP_CMD/\#define\ NSLOOKUP_CMD/g' "${ipxe_src_dir}/src/config/general.h" + sed -ei 's/^\/\/\#define[[:space:]]+TIME_CMD/\#define\ TIME_CMD/g' "${ipxe_src_dir}/src/config/general.h" + sed -ei 's/^\/\/\#define[[:space:]]+DIGEST_CMD/\#define\ DIGEST_CMD/g' "${ipxe_src_dir}/src/config/general.h" + sed -ei 's/^\/\/\#define[[:space:]]+REBOOT_CMD/\#define\ REBOOT_CMD/g' "${ipxe_src_dir}/src/config/general.h" + sed -ei 's/^\/\/\#define[[:space:]]+POWEROFF_CMD/\#define\ POWEROFF_CMD/g' "${ipxe_src_dir}/src/config/general.h" + sed -ei 's/^\/\/\#define[[:space:]]+IMAGE_TRUST_CMD/\#define\ IMAGE_TRUST_CMD/g' "${ipxe_src_dir}/src/config/general.h" + sed -ei 's/^\/\/\#define[[:space:]]+NTP_CMD/\#define\ NTP_CMD/g' "${ipxe_src_dir}/src/config/general.h" + sed -ei 's/^\/\/\#define[[:space:]]+CERT_CMD/\#define\ CERT_CMD/g' "${ipxe_src_dir}/src/config/general.h" - sed -i 's/^\#undef\ \ DOWNLOAD_PROTO_HTTPS/\#define\ DOWNLOAD_PROTO_HTTPS/g' "${ipxe_src_dir}/src/config/general.h" - sed -i 's/^\#undef\ \ NSLOOKUP_CMD/\#define\ NSLOOKUP_CMD/g' "${ipxe_src_dir}/src/config/general.h" - sed -i 's/^\#undef\ \ TIME_CMD/\#define\ TIME_CMD/g' "${ipxe_src_dir}/src/config/general.h" - sed -i 's/^\#undef\ \ DIGEST_CMD/\#define\ DIGEST_CMD/g' "${ipxe_src_dir}/src/config/general.h" - sed -i 's/^\#undef\ \ REBOOT_CMD/\#define\ REBOOT_CMD/g' "${ipxe_src_dir}/src/config/general.h" - sed -i 's/^\#undef\ \ POWEROFF_CMD/\#define\ POWEROFF_CMD/g' "${ipxe_src_dir}/src/config/general.h" - sed -i 's/^\#undef\ \ IMAGE_TRUST_CMD/\#define\ IMAGE_TRUST_CMD/g' "${ipxe_src_dir}/src/config/general.h" - sed -i 's/^\#undef\ \ NTP_CMD/\#define\ NTP_CMD/g' "${ipxe_src_dir}/src/config/general.h" - sed -i 's/^\#undef\ \ CERT_CMD/\#define\ CERT_CMD/g' "${ipxe_src_dir}/src/config/general.h" + sed -ei 's/^\#undef[[:space:]]+DOWNLOAD_PROTO_HTTPS/\#define\ DOWNLOAD_PROTO_HTTPS/g' "${ipxe_src_dir}/src/config/general.h" + sed -ei 's/^\#undef[[:space:]]+NSLOOKUP_CMD/\#define\ NSLOOKUP_CMD/g' "${ipxe_src_dir}/src/config/general.h" + sed -ei 's/^\#undef[[:space:]]+TIME_CMD/\#define\ TIME_CMD/g' "${ipxe_src_dir}/src/config/general.h" + sed -ei 's/^\#undef[[:space:]]+DIGEST_CMD/\#define\ DIGEST_CMD/g' "${ipxe_src_dir}/src/config/general.h" + sed -ei 's/^\#undef[[:space:]]+REBOOT_CMD/\#define\ REBOOT_CMD/g' "${ipxe_src_dir}/src/config/general.h" + sed -ei 's/^\#undef[[:space:]]+POWEROFF_CMD/\#define\ POWEROFF_CMD/g' "${ipxe_src_dir}/src/config/general.h" + sed -ei 's/^\#undef[[:space:]]+IMAGE_TRUST_CMD/\#define\ IMAGE_TRUST_CMD/g' "${ipxe_src_dir}/src/config/general.h" + sed -ei 's/^\#undef[[:space:]]+NTP_CMD/\#define\ NTP_CMD/g' "${ipxe_src_dir}/src/config/general.h" + sed -ei 's/^\#undef[[:space:]]+CERT_CMD/\#define\ CERT_CMD/g' "${ipxe_src_dir}/src/config/general.h" return 0 }