Improved comment line check

heroku · Mar 28, 2024 · c725e16 · c725e16
1 parent 8ecc138
commit c725e16
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/bin/compile b/bin/compile
@@ -96,7 +96,7 @@ while IFS= read -r PACKAGE; do
     IFS=$' \t' read -ra PACKAGE_NAMES <<< "$PACKAGE"
     apt-get "${APT_OPTIONS[@]}" -y "${APT_FORCE_YES[@]}" -d install --reinstall "${PACKAGE_NAMES[@]}" | indent
   fi
-done < <(grep --invert-match -e "^#" -e "^\s*$" -e "^:repo:" "${BUILD_DIR}/Aptfile")
+done < <(grep --invert-match -e "^\s*#" -e "^\s*$" -e "^:repo:" "${BUILD_DIR}/Aptfile")
 
 mkdir -p "$BUILD_DIR/.apt"
 

diff --git a/bin/report b/bin/report
@@ -23,7 +23,7 @@ while IFS= read -r line; do
       packages+=("${package_name}")
     done
   fi
-done < <(grep --invert-match -e "^#" -e "^\s*$" "${BUILD_DIR}/Aptfile")
+done < <(grep --invert-match -e "^\s*#" -e "^\s*$" "${BUILD_DIR}/Aptfile")
 
 output_key_value() {
   local key value

diff --git a/test/fixtures/package-names/Aptfile b/test/fixtures/package-names/Aptfile
@@ -6,3 +6,5 @@ mysql-client-*
 
 # multiple packages on single line
 s3cmd wget
+
+  # comment with bad indent
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,3 +6,5 @@ mysql-client-*

		# multiple packages on single line
		s3cmd wget

		# comment with bad indent