From fe996b3a35eea34fa01168a9b838167626b44be8 Mon Sep 17 00:00:00 2001 From: Ben Grande Date: Thu, 13 Jun 2024 13:14:41 +0200 Subject: [PATCH] ci: untracked readme is an untracked project --- scripts/qubesbuilder-gen.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/scripts/qubesbuilder-gen.sh b/scripts/qubesbuilder-gen.sh index e0bfcff..09b242c 100755 --- a/scripts/qubesbuilder-gen.sh +++ b/scripts/qubesbuilder-gen.sh @@ -6,6 +6,9 @@ set -eu +command -v git >/dev/null || { echo "Missing program: git" >&2; exit 1; } +cd "$(git rev-parse --show-toplevel)" || exit 1 + template=".qubesbuilder.template" target=".qubesbuilder" intended_target="${target}" @@ -16,7 +19,7 @@ if test "${1-}" = "test"; then fi ignored="$(git ls-files --exclude-standard --others --ignored)" untracked="$(git ls-files --exclude-standard --others)" -unwanted="$(echo "${ignored}" "${untracked}" | grep "^salt/" \ +unwanted="$(printf %s"${ignored}\n${untracked}\n" | grep "^salt/\S\+/README.md" \ | cut -d "/" -f2 | sort -u)" group="$(./scripts/spec-get.sh dom0 group)" projects="$(find salt/ -mindepth 1 -maxdepth 1 -type d \ @@ -25,6 +28,11 @@ for unwanted_project in ${unwanted}; do projects="$(echo "${projects}" | sed "\@rpm_spec/${group}-${unwanted_project}.spec@d")" done +if test "${1-}" = "print"; then + echo "${projects}" + exit 0 +fi + sed -e "/@SPEC@/d" "${template}" | tee "${target}" >/dev/null echo "${projects}" | tee -a "${target}" >/dev/null if test "${1-}" = "test"; then