Merge pull request #165 from infosiftr/jq-IN

Use jq's `IN()` instead of `index()`

Author: tianon

Dockerfile-curl.template

@@ -8,15 +8,15 @@ RUN set -eux; \
 		curl \
 		gnupg \
 		netbase \
-{{ if [
+{{ if env.codename | IN(
 	# we want versions of "sq" that contain https://gitlab.com/sequoia-pgp/sequoia/-/commit/b41e1504cd29097328cb21f95808c9972188499e (and thus "sq keyserver" subcommands; 0.26+)
 	# https://packages.debian.org/sq
 	"bullseye", # 0.24
 	# https://packages.ubuntu.com/sq
 	"jammy",    # 0.25
 	"focal",    # no sq
 	empty # trailing comma
-] | index(env.codename) then "" else ( -}}
+) then "" else ( -}}
 		sq \
 {{ ) end -}}
 		wget \

Dockerfile-scm.template

@@ -4,11 +4,7 @@ FROM buildpack-deps:{{ env.codename }}-curl
 RUN set -eux; \
 	apt-get update; \
 	apt-get install -y --no-install-recommends \
-{{
-if [
-	"focal", "groovy"
-] | index(env.codename) then (
--}}
+{{ if env.codename | IN("focal", "groovy") then ( -}}
 		bzr \
 {{ ) else "" end -}}
 		git \

shared.jq

@@ -1,5 +1,5 @@
 def apt_get_dist_clean:
-	if [
+	if env.codename | IN(
 		# only suites with APT 2.7.8+ have "apt-get dist-clean"
 		# https://tracker.debian.org/news/1492892/accepted-apt-278-source-into-unstable/
 
@@ -14,7 +14,7 @@ def apt_get_dist_clean:
 		"focal",
 
 		empty
-	] | index(env.codename) then
+	) then
 		"rm -rf /var/lib/apt/lists/*"
 	else
 		"apt-get dist-clean"