From d9192e314870b007d5598f83dd323d9350067592 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Wed, 31 Jan 2024 12:25:35 -0500 Subject: [PATCH 1/2] Remove unnecessary beautysh directive We no longer use that tool for linting, so there is no longer any need to work around its limitations. --- src/gather-domains.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/gather-domains.sh b/src/gather-domains.sh index 401409c..3c32142 100755 --- a/src/gather-domains.sh +++ b/src/gather-domains.sh @@ -85,17 +85,11 @@ sed -i '/[^,]*,[^,]*,Library of Congress,/d;/[^,]*,[^,]*,Government Publishing O # of these top-level domains is automatically extracted into the # TOP_LEVEL_DOMAINS variable. ### -# beautysh doesn't handle this multiline $() correctly, so we have to -# temporarily turn off the formatting. I created -# lovesegfault/beautysh#82 to document this. -# -# @formatter:off TOP_LEVEL_DOMAINS=$(cut --delimiter=, --fields=1 $OUTPUT_DIR/current-federal_modified.csv \ | awk -F"." '{if (NR > 1) print "."$NF;}' \ | sort --ignore-case --unique \ | tr "[:upper:]" "[:lower:]" \ | paste --serial --delimiters=,) -# @formatter:on $HOME_DIR/domain-scan/gather current_federal,analytics_usa_gov,censys_snapshot,rapid,eot_2012,eot_2016,cyhy,other \ --suffix="$TOP_LEVEL_DOMAINS" --ignore-www --include-parents \ --parents=$OUTPUT_DIR/current-federal_modified.csv \ From 819b594e03fbd2d38e915a746a55a4cf1c1722a7 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Wed, 31 Jan 2024 12:31:48 -0500 Subject: [PATCH 2/2] Update VM dev distro email address --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5fc312d..be86497 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ FROM python:3.12.1-slim-bullseye # # Note: Additional labels are added by the build workflow. ### -LABEL org.opencontainers.image.authors="vm-fusion-dev-group@trio.dhs.gov" +LABEL org.opencontainers.image.authors="vm-dev@gwe.cisa.dhs.gov" LABEL org.opencontainers.image.vendor="Cybersecurity and Infrastructure Security Agency" ###