Fix minor edge case in naughty-*.sh when BASHBREW_NAMESPACE is set

tianon · tianon · commit cb4885a6de55 · 2020-08-28T17:21:01.000-07:00
diff --git a/naughty-constraints.sh b/naughty-constraints.sh
@@ -74,7 +74,7 @@ declare -A allNaughty=(
 	#[img:tag]=1
 )
 
-tags="$(bashbrew list --uniq "$@" | sort -u)"
+tags="$(bashbrew --namespace '' list --uniq "$@" | sort -u)"
 for img in $tags; do
 	arches="$(_arches "$img")"
 	constraints="$(bashbrew cat --format '{{ .TagEntry.Constraints | join "\n" }}' "$img" | sort -u)"
diff --git a/naughty-from.sh b/naughty-from.sh
@@ -85,7 +85,7 @@ declare -A allNaughty=(
 	#[img:tag]=1
 )
 
-tags="$(bashbrew list --uniq "$@" | sort -u)"
+tags="$(bashbrew --namespace '' list --uniq "$@" | sort -u)"
 for img in $tags; do
 	arches="$(_arches "$img")"
 	hasNice= # do we have _any_ arches that aren't naughty? (so we can make the message better if not)

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ declare -A allNaughty=(`
`74`	`74`	`#[img:tag]=1`
`75`	`75`	`)`
`76`	`76`
`77`		`-tags="$(bashbrew list --uniq "$@" \| sort -u)"`
	`77`	`+tags="$(bashbrew --namespace '' list --uniq "$@" \| sort -u)"`
`78`	`78`	`for img in $tags; do`
`79`	`79`	`arches="$(_arches "$img")"`
`80`	`80`	`constraints="$(bashbrew cat --format '{{ .TagEntry.Constraints \| join "\n" }}' "$img" \| sort -u)"`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ declare -A allNaughty=(`
`85`	`85`	`#[img:tag]=1`
`86`	`86`	`)`
`87`	`87`
`88`		`-tags="$(bashbrew list --uniq "$@" \| sort -u)"`
	`88`	`+tags="$(bashbrew --namespace '' list --uniq "$@" \| sort -u)"`
`89`	`89`	`for img in $tags; do`
`90`	`90`	`arches="$(_arches "$img")"`
`91`	`91`	`hasNice= # do we have _any_ arches that aren't naughty? (so we can make the message better if not)`