[type/__dtnrch_etax_sgnp] Improve release selection algorithm

The new 2023 SGnP version now ships separate Intel and ARM releases for Mac, for
whatever reason, likely incompetence.

18 files changed, 117 insertions, 85 deletions

diff --git a/type/__dtnrch_etax_sgnp/files/find_release.sh b/type/__dtnrch_etax_sgnp/files/find_release.sh
index fc7dc66..6e76d0e 100755
--- a/type/__dtnrch_etax_sgnp/files/find_release.sh
+++ b/type/__dtnrch_etax_sgnp/files/find_release.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 #
-# 2021 Dennis Camera (cdist at dtnr.ch)
+# 2021,2024 Dennis Camera (skonfig at dtnr.ch)
 #
 # This file is part of cdist.
 #
@@ -34,57 +34,95 @@ test -d "${__type:?}/files/versions/${version}" \
 case ${kernel_name}
 in
 	(Darwin)
-		options='macosx'
+		os_options='macosx'
 		;;
 	(*CYGWIN*|*NT*)
-		options='windows'
+		os_options='win'
 		;;
 	(*)
-		bit_suffix() {
-			case ${machine}
-			in
-				(*64*) echo "${1}64 ${1} ${1}32" ;;
-				(*) echo "${1} ${1}32" ;;
-			esac
-		}
-
 		case ${os}
 		in
 			(debian|devuan|ubuntu)
-				options=$(bit_suffix debian) ;;
+				os_options=debian ;;
 			(rhel|scientific|centos|fedora)
-				options=$(bit_suffix redhat) ;;
+				os_options=redhat ;;
 			(suse)
-				options=$(bit_suffix suse) ;;
+				os_options=suse ;;
 		esac
 
 		case ${kernel_name}
 		in
 			(Linux)
-				options=${options-}${options:+ }$(bit_suffix linux)
+				os_options=${os_options-}${os_options:+ }'linux unix'
 				;;
 			(*BSD)
-				options=${options-}${options:+ }$(bit_suffix bsd)
+				os_options=${os_options-}${os_options:+ }'bsd unix'
 				;;
 		esac
+		;;
+esac
 
-		options=${options-}${options:+ }$(bit_suffix unix)
+arch_options='any'
+case ${machine}
+in
+	(arm|armv?l)
+		# AArch32 (little-endian)
+		arch_options=${arch_options-}${arch_options:+ }'arm@32' ;;
+	(aarch64)
+		# AArch64 (little-endian)
+		arch_options=${arch_options-}${arch_options:+ }'arm@64' ;;
+	(x86_64)
+		# amd64 (multi-arch)
+		arch_options=${arch_options-}${arch_options:+ }'x86@64 x86@32' ;;
+	(i?86)
+		# x86
+		arch_options=${arch_options-}${arch_options:+ }'x86@32' ;;
+	(ppc)
+		# PowerPC
+		arch_options=${arch_options-}${arch_options:+ }'ppc@32' ;;
+	(ppc64)
+		# PowerPC 64
+		arch_options=${arch_options-}${arch_options:+ }'ppc@64' ;;
+	(ppc64le|ppc64el)
+		# PowerPC 64 (little-endian)
+		arch_options=${arch_options-}${arch_options:+ }'ppcle@64' ;;
+	(mips)
+		# MIPS (32-bit, ?-endian)
+		arch_options=${arch_options-}${arch_options:+ }'mips@32' ;;
+	(*)
+		echo 'Could not determine your CPU architecture.' >&2
+		exit 1
 		;;
 esac
 
 metafile="${__type:?}/files/versions/${version}/META.ini"
 sections=$(command -p awk -f "${__type:?}/files/ini_sections.awk" "${metafile}")
 
-# Check if any of the available releases are compatible
-for _opt in ${options}
+for _os in ${os_options}
 do
-	if printf '%s\n' "${sections}" | grep -Fqx "${_opt}"
-	then
-		variant=${_opt}
-		break
-	fi
+	while read -r _v
+	do
+		# os is first part of section name
+		_v_os=${_v%%-*}
+
+		test "${_v_os}" = "${_os}" || continue
+
+		for _arch in ${arch_options}
+		do
+			# arch is second part of section name
+			_v_arch=${_v#*-}
+			_v_arch=${_v_arch%%-*}
+
+			test "${_v_arch}" = "${_arch}" || continue
+
+			# it’s a match
+			variant=${_v}
+			break 2
+		done
+	done <<-EOF
+	${sections}
+	EOF
 done
-unset _opt
 
 test -n "${variant}" || {
 	echo 'No compatible release found.' >&2
diff --git a/type/__dtnrch_etax_sgnp/files/versions/2007/META.ini b/type/__dtnrch_etax_sgnp/files/versions/2007/META.ini
index 0073189..35579a9 100644
--- a/type/__dtnrch_etax_sgnp/files/versions/2007/META.ini
+++ b/type/__dtnrch_etax_sgnp/files/versions/2007/META.ini
@@ -3,7 +3,7 @@ release = 8.0.5
 java = 1.5.0
 java_min = 1.4.2
 
-[win32]
+[win-x86@32]
 url = https://steuersoftware.sg.oca.ch/Steuern_2007/SGnP2007_installieren_windows.exe
 url_alt =
 url_archive = https://web.archive.org/web/20210217174123/https://steuersoftware.sg.oca.ch/Steuern_2007/SGnP2007_installieren_windows.exe
@@ -13,7 +13,7 @@ sha256sum = dc2d45ea89d331d00d5b773fd292c879b280a0c443821b375e9700dd7c6856e5
 default_install_dir = C:\Program Files (x86)\Steuer SGnP2007
 java = 1.5.0_14-b03
 
-[macosx]
+[macosx-any]
 url = https://steuersoftware.sg.oca.ch/Steuern_2007/SGnP2007_installieren_macos.dmg
 url_alt =
 url_archive = https://web.archive.org/web/20210217174151/https://steuersoftware.sg.oca.ch/Steuern_2007/SGnP2007_installieren_macos.dmg
@@ -23,7 +23,7 @@ sha256sum = 143d23f65a81b5ca853abd29ec8f4ebb9593cbe0ef9e194cc022ed03e6fa1721
 default_install_dir = /Applications/Steuer SGnP2007
 no_jre = 1
 
-[unix]
+[unix-any]
 url = https://steuersoftware.sg.oca.ch/Steuern_2007/SGnP2007_installieren_unix.sh
 url_alt =
 url_archive = https://web.archive.org/web/20150319111016/http://steuersoftware.sg.oca.ch/Steuern_2007/SGnP2007_installieren_unix.sh
diff --git a/type/__dtnrch_etax_sgnp/files/versions/2008/META.ini b/type/__dtnrch_etax_sgnp/files/versions/2008/META.ini
index 4350be9..6fdb3a3 100644
--- a/type/__dtnrch_etax_sgnp/files/versions/2008/META.ini
+++ b/type/__dtnrch_etax_sgnp/files/versions/2008/META.ini
@@ -3,9 +3,8 @@ release = 9.0.2
 java = 1.5.0
 java_min = 1.4.2
 
-[win32]
+[win-x86@32]
 url = https://steuersoftware.sg.oca.ch/Steuern_2008/SGnP2008_installieren_windows.exe
-url_alt =
 url_archive = https://web.archive.org/web/20210217174039/https://steuersoftware.sg.oca.ch/Steuern_2008/SGnP2008_installieren_windows.exe
 filename = SGnP2008_installieren_windows.exe
 cksum = 1966080536 22927096
@@ -13,9 +12,8 @@ sha256sum = 2cbe95795ac5efaa6c6af3994118aa68b2c79f6489be64f230ec3a8f5a50fe3a
 default_install_dir = C:\Program Files (x86)\Steuer SGnP2008
 java = 1.5.0_16-b02
 
-[macosx]
+[macosx-any]
 url = https://steuersoftware.sg.oca.ch/Steuern_2008/SGnP2008_installieren_macos.dmg
-url_alt =
 url_archive = https://web.archive.org/web/20210217174100/https://steuersoftware.sg.oca.ch/Steuern_2008/SGnP2008_installieren_macos.dmg
 filename = SGnP2008_installieren_macos.dmg
 cksum = 2637495216 10973184
@@ -23,9 +21,8 @@ sha256sum = cbc38f9d0b1ed33b8b569f663d368a52b908ce04a9592298f547076123e9b58c
 default_install_dir = /Applications/Steuer SGnP2008
 no_jre = 1
 
-[unix]
+[unix-any]
 url = https://steuersoftware.sg.oca.ch/Steuern_2008/SGnP2008_installieren_unix.sh
-url_alt =
 url_archive = https://web.archive.org/web/20150319110726/http://steuersoftware.sg.oca.ch/Steuern_2008/SGnP2008_installieren_unix.sh
 filename = SGnP2008_installieren_unix.sh
 cksum = 3178176154 10538868
diff --git a/type/__dtnrch_etax_sgnp/files/versions/2009/META.ini b/type/__dtnrch_etax_sgnp/files/versions/2009/META.ini
index 6fddbbc..40e77a6 100644
--- a/type/__dtnrch_etax_sgnp/files/versions/2009/META.ini
+++ b/type/__dtnrch_etax_sgnp/files/versions/2009/META.ini
@@ -3,7 +3,7 @@ release = 10.0.2
 java_min = 1.5.0
 java = 1.6.0
 
-[win32]
+[win-x86@32]
 url = https://steuersoftware.sg.oca.ch/Steuern_2009/SGnP2009_installieren_windows.exe
 url_alt =
 url_archive = https://web.archive.org/web/20210217174032/https://steuersoftware.sg.oca.ch/Steuern_2009/SGnP2009_installieren_windows.exe
@@ -13,9 +13,8 @@ sha256sum = 8ea87aeedf704165b953ae42c467949f34f4ba4538cff798d66dcb8057e21510
 default_install_dir = C:\Program Files (x86)\Steuer SGnP2009
 java = 1.6.0_17-b04
 
-[macosx]
+[macosx-any]
 url = https://steuersoftware.sg.oca.ch/Steuern_2009/SGnP2009_installieren_macos.dmg
-url_alt =
 url_archive = https://web.archive.org/web/20210217174054/https://steuersoftware.sg.oca.ch/Steuern_2009/SGnP2009_installieren_macos.dmg
 filename = SGnP2009_installieren_macos.dmg
 cksum = 2875358710 12449792
@@ -24,9 +23,8 @@ default_install_dir = /Applications/Steuer SGnP2009
 no_jre = 1
 java_min = 1.4.2
 
-[unix]
+[unix-any]
 url = https://steuersoftware.sg.oca.ch/Steuern_2009/SGnP2009_installieren_unix.sh
-url_alt =
 url_archive = https://web.archive.org/web/20210217174109/https://steuersoftware.sg.oca.ch/Steuern_2009/SGnP2009_installieren_unix.sh
 filename = SGnP2009_installieren_unix.sh
 no_jre = 1
diff --git a/type/__dtnrch_etax_sgnp/files/versions/2010/META.ini b/type/__dtnrch_etax_sgnp/files/versions/2010/META.ini
index 22865cc..4c6fc29 100644
--- a/type/__dtnrch_etax_sgnp/files/versions/2010/META.ini
+++ b/type/__dtnrch_etax_sgnp/files/versions/2010/META.ini
@@ -3,9 +3,8 @@ release = 11.0.1
 java = 1.6.0_23
 java_min = 1.5.0
 
-[win32]
+[win-x86@32]
 url = https://steuersoftware.sg.oca.ch/Steuern_2010/SGnP2010_installieren_windows.exe
-url_alt =
 url_archive = https://web.archive.org/web/20210217173645/https://steuersoftware.sg.oca.ch/Steuern_2010/SGnP2010_installieren_windows.exe
 filename = SGnP2010_installieren_windows.exe
 cksum = 1184834496 30828480
@@ -13,9 +12,8 @@ sha256sum = 70d1fe46f3627fe35a2dcb3ab0db7d43e8e22cc5fae321635b44e2b56dd8b7d5
 default_install_dir = C:\Program Files (x86)\Steuer SGnP2010
 java = 1.6.0_23-b05
 
-[macosx]
+[macosx-any]
 url = https://steuersoftware.sg.oca.ch/Steuern_2010/SGnP2010_installieren_macos.dmg
-url_alt =
 url_archive = https://web.archive.org/web/20210217173737/https://steuersoftware.sg.oca.ch/Steuern_2010/SGnP2010_installieren_macos.dmg
 filename = SGnP2010_installieren_macos.dmg
 cksum = 3833315260 13928448
@@ -24,9 +22,8 @@ default_install_dir = /Applications/Steuer SGnP2010
 no_jre = 1
 java_min = 1.4.2
 
-[unix32]
+[unix-x86@32]
 url = https://steuersoftware.sg.oca.ch/Steuern_2010/SGnP2010_installieren_unix_jvm.sh
-url_alt =
 url_archive = https://web.archive.org/web/20210217173803/https://steuersoftware.sg.oca.ch/Steuern_2010/SGnP2010_installieren_unix_jvm.sh
 filename = SGnP2010_installieren_unix_jvm.sh
 cksum = 2269413045 34501947
diff --git a/type/__dtnrch_etax_sgnp/files/versions/2011/META.ini b/type/__dtnrch_etax_sgnp/files/versions/2011/META.ini
index 2699ca2..da73e80 100644
--- a/type/__dtnrch_etax_sgnp/files/versions/2011/META.ini
+++ b/type/__dtnrch_etax_sgnp/files/versions/2011/META.ini
@@ -3,7 +3,7 @@ release = 12.0.1
 java = 1.6.0_30
 java_min = 1.5.0
 
-[win32]
+[win-x86@32]
 url = https://steuersoftware.sg.oca.ch/Steuern_2011/SGnP2011_installieren_windows.exe
 url_alt =
 url_archive = https://web.archive.org/web/20210217173637/https://steuersoftware.sg.oca.ch/Steuern_2011/SGnP2011_installieren_windows.exe
@@ -13,7 +13,7 @@ sha256sum = 24dfb12019e9c995c7c5155db3797d3da3850e452166762bd6dd58460f293302
 default_install_dir = C:\Program Files (x86)\Steuer SGnP2011
 java = 1.6.0_30-b12
 
-[macosx]
+[macosx-any]
 url = https://steuersoftware.sg.oca.ch/Steuern_2011/SGnP2011_installieren_macos.dmg
 url_alt =
 url_archive = https://web.archive.org/web/20210217173728/https://steuersoftware.sg.oca.ch/Steuern_2011/SGnP2011_installieren_macos.dmg
@@ -24,7 +24,7 @@ default_install_dir = /Applications/Steuer SGnP2011
 no_jre = 1
 java_min = 1.4.2
 
-[unix]
+[unix-any]
 url = https://steuersoftware.sg.oca.ch/Steuern_2011/SGnP2011_installieren_unix.sh
 url_alt =
 url_archive = https://web.archive.org/web/20210217173816/https://steuersoftware.sg.oca.ch/Steuern_2011/SGnP2011_installieren_unix.sh
diff --git a/type/__dtnrch_etax_sgnp/files/versions/2012/META.ini b/type/__dtnrch_etax_sgnp/files/versions/2012/META.ini
index 635195c..82dee12 100644
--- a/type/__dtnrch_etax_sgnp/files/versions/2012/META.ini
+++ b/type/__dtnrch_etax_sgnp/files/versions/2012/META.ini
@@ -3,7 +3,7 @@ release = 13.0.3
 java = 1.6.0_38-b05
 java_min = 1.6.0
 
-[win32]
+[win-x86@32]
 url = https://steuersoftware.sg.oca.ch/Steuern_2012/SGnP2012_installieren_windows.exe
 url_alt =
 url_archive = https://web.archive.org/web/20210217173044/https://steuersoftware.sg.oca.ch/Steuern_2012/SGnP2012_installieren_windows.exe
@@ -13,7 +13,7 @@ sha256sum = 2c9a6eeb99cafa0304784e826c34fe47fa1b42b70e83b64829cf85ecfe40a271
 default_install_dir = C:\Program Files (x86)\Steuer SGnP2012
 java = 1.6.0_38-b05
 
-[macosx]
+[macosx-any]
 url = https://steuersoftware.sg.oca.ch/Steuern_2012/SGnP2012_installieren_macos.dmg
 url_alt =
 url_archive = https://web.archive.org/web/20210217173214/https://steuersoftware.sg.oca.ch/Steuern_2012/SGnP2012_installieren_macos.dmg
@@ -24,7 +24,7 @@ java_min = 1.5.0
 default_install_dir = /Applications/Steuer SGnP2012
 no_jre = 1
 
-[unix32]
+[unix-x86@32]
 url = https://steuersoftware.sg.oca.ch/Steuern_2012/SGnP2012_installieren_unix_jvm.sh
 url_alt =
 url_archive = https://web.archive.org/web/20210217173247/https://steuersoftware.sg.oca.ch/Steuern_2012/SGnP2012_installieren_unix_jvm.sh
diff --git a/type/__dtnrch_etax_sgnp/files/versions/2013/META.ini b/type/__dtnrch_etax_sgnp/files/versions/2013/META.ini
index ad3194b..5c06f5d 100644
--- a/type/__dtnrch_etax_sgnp/files/versions/2013/META.ini
+++ b/type/__dtnrch_etax_sgnp/files/versions/2013/META.ini
@@ -3,7 +3,7 @@ release = 14.0.1
 java = 1.6.0_38
 java_min = 1.6.0
 
-[win32]
+[win-x86@32]
 url = https://steuersoftware.sg.oca.ch/Steuern_2013/SGnP2013_installieren_windows.exe
 url_alt =
 url_archive = https://web.archive.org/web/20210217173051/https://steuersoftware.sg.oca.ch/Steuern_2013/SGnP2013_installieren_windows.exe
@@ -13,7 +13,7 @@ sha256sum = fc4019a405fe24e51577e12d1622d04b8fc61d48c5d770d8a63a0f310da20e8b
 default_install_dir = C:\Program Files (x86)\Steuer SGnP2013
 java = 1.6.0_38-b05
 
-[macosx]
+[macosx-any]
 url = https://steuersoftware.sg.oca.ch/Steuern_2013/SGnP2013_installieren_macos.dmg
 url_alt =
 url_archive = https://web.archive.org/web/20210217173224/https://steuersoftware.sg.oca.ch/Steuern_2013/SGnP2013_installieren_macos.dmg
@@ -24,7 +24,7 @@ java_min = 1.5.0
 default_install_dir = /Applications/Steuer SGnP2013
 no_jre = 1
 
-[unix32]
+[unix-x86@32]
 url = https://steuersoftware.sg.oca.ch/Steuern_2013/SGnP2013_installieren_unix_jvm.sh
 url_alt =
 url_archive = https://web.archive.org/web/20210217173344/https://steuersoftware.sg.oca.ch/Steuern_2013/SGnP2013_installieren_unix_jvm.sh
diff --git a/type/__dtnrch_etax_sgnp/files/versions/2014/META.ini b/type/__dtnrch_etax_sgnp/files/versions/2014/META.ini
index 3bba164..8973293 100644
--- a/type/__dtnrch_etax_sgnp/files/versions/2014/META.ini
+++ b/type/__dtnrch_etax_sgnp/files/versions/2014/META.ini
@@ -3,7 +3,7 @@ release = 15.0.5
 java = 1.6.0_45
 java_min = 1.6.0
 
-[win32]
+[win-x86@32]
 url =
 url_alt = https://www.sg.ch/steuern-finanzen/steuern/elektronische-steuererklaerung/etaxes-privatpersonen/download-elektronische-steuererklaerung-frueherer-jahre/_jcr_content/Par/sgch_accordion_list/AccordionListPar/sgch_accordion_copy__402997436/AccordionPar/sgch_downloadlist_2081495338/DownloadListPar/sgch_download.ocFile/SGnP2014_installieren_windows.exe
 filename = SGnP2014_installieren_windows.exe
@@ -13,7 +13,7 @@ default_install_dir = C:\Program Files (x86)\Steuer SGnP2014
 java = 1.6.0_45
 no_jre = 1
 
-[macosx]
+[macosx-any]
 url = https://steuersoftware.sg.oca.ch/Steuern_2014/SGnP2014_installieren_macos.dmg
 url_alt = https://www.sg.ch/steuern-finanzen/steuern/elektronische-steuererklaerung/etaxes-privatpersonen/download-elektronische-steuererklaerung-frueherer-jahre/_jcr_content/Par/sgch_accordion_list/AccordionListPar/sgch_accordion_copy__402997436/AccordionPar/sgch_downloadlist_2081495338/DownloadListPar/sgch_download_1215036226.ocFile/SGnP2014_installieren_macos_mit_JRE.dmg
 filename = SGnP2014_installieren_macos_mit_JRE.dmg
@@ -23,7 +23,7 @@ java_min = 1.5.0
 default_install_dir = /Applications/Steuer SGnP2014
 no_jre = 1
 
-[unix64]
+[unix-x86@64]
 url =
 url_alt = https://www.sg.ch/steuern-finanzen/steuern/elektronische-steuererklaerung/etaxes-privatpersonen/download-elektronische-steuererklaerung-frueherer-jahre/_jcr_content/Par/sgch_accordion_list/AccordionListPar/sgch_accordion_copy__402997436/AccordionPar/sgch_downloadlist_2081495338/DownloadListPar/sgch_download_438451519.ocFile/SGnP2014_installieren_unix_mit_64bit_JRE.sh
 filename = SGnP2014_installieren_unix_mit_64bit_JRE.sh
@@ -32,7 +32,7 @@ sha256sum = b6d135e75e2cd54e40ce039ff6c44b24e23e7459faeb36039ef1e30375357d9d
 default_install_dir = /opt/steuer2014
 java = 1.6.0_45-b06
 
-[unix32]
+[unix-x86@32]
 url =
 url_alt = https://www.sg.ch/steuern-finanzen/steuern/elektronische-steuererklaerung/etaxes-privatpersonen/download-elektronische-steuererklaerung-frueherer-jahre/_jcr_content/Par/sgch_accordion_list/AccordionListPar/sgch_accordion_copy__402997436/AccordionPar/sgch_downloadlist_2081495338/DownloadListPar/sgch_download_1679624893.ocFile/SGnP2014_installieren_unix_mit_32bit_JRE.sh
 filename = SGnP2014_installieren_unix_mit_32bit_JRE.sh
diff --git a/type/__dtnrch_etax_sgnp/files/versions/2015/META.ini b/type/__dtnrch_etax_sgnp/files/versions/2015/META.ini
index 082c31d..7ac7c3d 100644
--- a/type/__dtnrch_etax_sgnp/files/versions/2015/META.ini
+++ b/type/__dtnrch_etax_sgnp/files/versions/2015/META.ini
@@ -4,7 +4,7 @@ java = 1.7.0_80
 java_min = 1.7.0
 update_url = https://updates.information-factory.com/egov/sgnp/updatesSGnP2015.xml
 
-[win32]
+[win-x86@32]
 url = https://steuersoftware.sg.oca.ch/Steuern_2015/SGnP2015_installieren_windows.exe
 url_alt = https://www.sg.ch/steuern-finanzen/steuern/elektronische-steuererklaerung/etaxes-privatpersonen/download-elektronische-steuererklaerung-frueherer-jahre/_jcr_content/Par/sgch_accordion_list/AccordionListPar/sgch_accordion_copy_2048369794/AccordionPar/sgch_downloadlist/DownloadListPar/sgch_download.ocFile/SGnP2015_installieren_windows.exe
 url_archive = https://web.archive.org/web/20210217125451/https://steuersoftware.sg.oca.ch/Steuern_2015/SGnP2015_installieren_windows.exe
@@ -14,7 +14,7 @@ sha256sum = 1e8bdf94be9700ae9b14becbd1093801562f5d6479b838e0103d447446389158
 default_install_dir = C:\Program Files (x86)\Steuer St.Gallen 2015 nP
 java = 1.7.0_80-b15
 
-[macosx]
+[macosx-x86@64]
 url = https://steuersoftware.sg.oca.ch/Steuern_2015/SGnP2015_installieren_macos.dmg
 url_alt = https://www.sg.ch/steuern-finanzen/steuern/elektronische-steuererklaerung/etaxes-privatpersonen/download-elektronische-steuererklaerung-frueherer-jahre/_jcr_content/Par/sgch_accordion_list/AccordionListPar/sgch_accordion_copy_2048369794/AccordionPar/sgch_downloadlist/DownloadListPar/sgch_download_737298454.ocFile/SGnP2015_installieren_macos.dmg
 url_archive = https://web.archive.org/web/20210217125521/https://steuersoftware.sg.oca.ch/Steuern_2015/SGnP2015_installieren_macos.dmg
@@ -24,7 +24,7 @@ sha256sum = 6d61f150a859d11dccc3f8794d122819e896556a894c930bc7d39f1bdfe25d75
 default_install_dir = /Applications/Steuer St.Gallen 2015 nP
 java = 1.7.0_80-b15
 
-[unix64]
+[unix-x86@64]
 url = https://steuersoftware.sg.oca.ch/Steuern_2015/SGnP2015_installieren_unix_64bit.sh
 url_alt = https://www.sg.ch/steuern-finanzen/steuern/elektronische-steuererklaerung/etaxes-privatpersonen/download-elektronische-steuererklaerung-frueherer-jahre/_jcr_content/Par/sgch_accordion_list/AccordionListPar/sgch_accordion_copy_2048369794/AccordionPar/sgch_downloadlist/DownloadListPar/sgch_download_318031963.ocFile/SGnP2015_installieren_unix_64bit.sh
 url_archive = https://web.archive.org/web/20210217125708/https://steuersoftware.sg.oca.ch/Steuern_2015/SGnP2015_installieren_unix_64bit.sh
@@ -34,7 +34,7 @@ sha256sum = 0dda37d7b585286c686c85ab0630299499866a00ec83a314290c70b43381c971
 default_install_dir = /opt/Steuer_St.Gallen_2015_nP
 java = 1.7.0_80-b15
 
-[unix32]
+[unix-x86@32]
 url = https://steuersoftware.sg.oca.ch/Steuern_2015/SGnP2015_installieren_unix_32bit.sh
 url_alt = https://www.sg.ch/steuern-finanzen/steuern/elektronische-steuererklaerung/etaxes-privatpersonen/download-elektronische-steuererklaerung-frueherer-jahre/_jcr_content/Par/sgch_accordion_list/AccordionListPar/sgch_accordion_copy_2048369794/AccordionPar/sgch_downloadlist/DownloadListPar/sgch_download_1858344745.ocFile/SGnP2015_installieren_unix_32bit.sh
 url_archive = https://web.archive.org/web/20210217125835/https://steuersoftware.sg.oca.ch/Steuern_2015/SGnP2015_installieren_unix_32bit.sh
diff --git a/type/__dtnrch_etax_sgnp/files/versions/2016/META.ini b/type/__dtnrch_etax_sgnp/files/versions/2016/META.ini
index 1eeab31..4de7f32 100644
--- a/type/__dtnrch_etax_sgnp/files/versions/2016/META.ini
+++ b/type/__dtnrch_etax_sgnp/files/versions/2016/META.ini
@@ -4,7 +4,7 @@ java = 1.8.0_102
 java_min = 1.8.0
 update_url = https://updates.information-factory.com/egov/sgnp/updatesSGnP2016.xml
 
-[win32]
+[win-x86@32]
 url = https://steuersoftware.sg.oca.ch/Steuern_2016/SGnP2016_installieren_windows.exe
 url_alt = https://www.sg.ch/steuern-finanzen/steuern/elektronische-steuererklaerung/etaxes-privatpersonen/download-elektronische-steuererklaerung-frueherer-jahre/_jcr_content/Par/sgch_accordion_list/AccordionListPar/sgch_accordion_copy/AccordionPar/sgch_downloadlist/DownloadListPar/sgch_download.ocFile/SGnP2016_installieren_windows.exe
 url_archive = https://web.archive.org/web/20210217125432/https://steuersoftware.sg.oca.ch/Steuern_2016/SGnP2016_installieren_windows.exe
@@ -14,7 +14,7 @@ sha256sum = c0b8ebe864ad87e288b1cf438387d88ebaf8e5b2775eac4cdcefa236417ad071
 default_install_dir = C:\Program Files (x86)\Steuer St.Gallen 2016 nP
 java = 1.8.0_102-b14
 
-[macosx]
+[macosx-x86@64]
 url = https://steuersoftware.sg.oca.ch/Steuern_2016/SGnP2016_installieren_macos.dmg
 url_alt = https://www.sg.ch/steuern-finanzen/steuern/elektronische-steuererklaerung/etaxes-privatpersonen/download-elektronische-steuererklaerung-frueherer-jahre/_jcr_content/Par/sgch_accordion_list/AccordionListPar/sgch_accordion/AccordionPar/sgch_downloadlist/DownloadListPar/sgch_download_737298454.ocFile/SGnP2016_macos.dmg
 url_archive = https://web.archive.org/web/20210217125615/https://steuersoftware.sg.oca.ch/Steuern_2016/SGnP2016_installieren_macos.dmg
@@ -24,7 +24,7 @@ sha256sum = 15e1fafcb8f62dbe47c2906f406b5734e5c07d1904308e711c217610614ca384
 default_install_dir = /Applications/Steuer St.Gallen 2016 nP
 java = 1.8.0_102-b14
 
-[unix64]
+[unix-x86@64]
 url = https://steuersoftware.sg.oca.ch/Steuern_2016/SGnP2016_installieren_unix_64bit.sh
 url_alt = https://www.sg.ch/steuern-finanzen/steuern/elektronische-steuererklaerung/etaxes-privatpersonen/download-elektronische-steuererklaerung-frueherer-jahre/_jcr_content/Par/sgch_accordion_list/AccordionListPar/sgch_accordion_copy/AccordionPar/sgch_downloadlist/DownloadListPar/sgch_download_318031963.ocFile/SGnP2016_installieren_unix_64bit.sh
 url_archive = https://web.archive.org/web/20210217131329/https://steuersoftware.sg.oca.ch/Steuern_2016/SGnP2016_installieren_unix_64bit.sh
@@ -34,7 +34,7 @@ sha256sum = b5d2ddda6c31f51dd75ce44818950facb07484c306a8decdefcdb5c431ba4c61
 default_install_dir = /opt/Steuer_St.Gallen_2016_nP
 java = 1.8.0_102-b14
 
-[unix32]
+[unix-x86@32]
 url = https://steuersoftware.sg.oca.ch/Steuern_2016/SGnP2016_installieren_unix_32bit.sh
 url_alt = https://www.sg.ch/steuern-finanzen/steuern/elektronische-steuererklaerung/etaxes-privatpersonen/download-elektronische-steuererklaerung-frueherer-jahre/_jcr_content/Par/sgch_accordion_list/AccordionListPar/sgch_accordion_copy/AccordionPar/sgch_downloadlist/DownloadListPar/sgch_download_1858344745.ocFile/SGnP2016_installieren_unix_32bit.sh
 url_archive = https://web.archive.org/web/20210217131557/https://steuersoftware.sg.oca.ch/Steuern_2016/SGnP2016_installieren_unix_32bit.sh
diff --git a/type/__dtnrch_etax_sgnp/files/versions/2017/META.ini b/type/__dtnrch_etax_sgnp/files/versions/2017/META.ini
index 2b4aabc..fd02c93 100644
--- a/type/__dtnrch_etax_sgnp/files/versions/2017/META.ini
+++ b/type/__dtnrch_etax_sgnp/files/versions/2017/META.ini
@@ -4,7 +4,7 @@ java = 1.8.0_144
 java_min = 1.8.0
 update_url = https://updates.information-factory.com/egov/sgnp/updatesSGnP2017.xml
 
-[win32]
+[win-x86@32]
 url = https://steuersoftware.sg.oca.ch/Steuern_2017/SGnP2017_installieren_windows.exe
 url_alt = https://www.sg.ch/steuern-finanzen/steuern/elektronische-steuererklaerung/etaxes-privatpersonen/download-elektronische-steuererklaerung-frueherer-jahre/_jcr_content/Par/sgch_accordion_list/AccordionListPar/sgch_accordion/AccordionPar/sgch_downloadlist/DownloadListPar/sgch_download.ocFile/SGnP2017_installieren_windows.exe
 url_archive = https://web.archive.org/web/20210216210142/https://steuersoftware.sg.oca.ch/Steuern_2017/SGnP2017_installieren_windows.exe
@@ -14,7 +14,7 @@ sha256sum = 5ee4109b5254fe3a6a63ff98c19ea1b8a01efcc0b5da1235ca79d021c0991740
 default_install_dir = C:\Program Files (x86)\Steuer St.Gallen 2017 nP
 java = 1.8.0_144-b01
 
-[macosx]
+[macosx-x86@64]
 url = https://steuersoftware.sg.oca.ch/Steuern_2017/SGnP2017_installieren_macos.dmg
 url_alt = https://www.sg.ch/steuern-finanzen/steuern/elektronische-steuererklaerung/etaxes-privatpersonen/download-elektronische-steuererklaerung-frueherer-jahre/_jcr_content/Par/sgch_accordion_list/AccordionListPar/sgch_accordion/AccordionPar/sgch_downloadlist/DownloadListPar/sgch_download_737298454.ocFile/SGnP2017_macos.dmg
 url_archive = https://web.archive.org/web/20210216210644/https://steuersoftware.sg.oca.ch/Steuern_2017/SGnP2017_installieren_macos.dmg
@@ -24,7 +24,7 @@ sha256sum = 0f1425a32e541004e89bcaed90b28a89b19d0ecc262218a63d8dbb80f77bd2e6
 default_install_dir = /Applications/Steuer St.Gallen 2017 nP
 java = 1.8.0_102-b14
 
-[unix64]
+[unix-x86@64]
 url = https://steuersoftware.sg.oca.ch/Steuern_2017/SGnP2017_installieren_unix_64bit.sh
 url_alt = https://www.sg.ch/steuern-finanzen/steuern/elektronische-steuererklaerung/etaxes-privatpersonen/download-elektronische-steuererklaerung-frueherer-jahre/_jcr_content/Par/sgch_accordion_list/AccordionListPar/sgch_accordion/AccordionPar/sgch_downloadlist/DownloadListPar/sgch_download_318031963.ocFile/SGnP2017_installieren_unix_64bit.sh
 url_archive = https://web.archive.org/web/20210216211148/https://steuersoftware.sg.oca.ch/Steuern_2017/SGnP2017_installieren_unix_64bit.sh
@@ -34,7 +34,7 @@ sha256sum = c4bfc988d2009149b0f561d740717acb625a248febbf5b8ac3b16a8c056701bc
 default_install_dir = /opt/Steuer_St.Gallen_2017_nP
 java = 1.8.0_144-b01
 
-[unix32]
+[unix-x86@32]
 url = https://steuersoftware.sg.oca.ch/Steuern_2017/SGnP2017_installieren_unix_32bit.sh
 url_alt = https://www.sg.ch/steuern-finanzen/steuern/elektronische-steuererklaerung/etaxes-privatpersonen/download-elektronische-steuererklaerung-frueherer-jahre/_jcr_content/Par/sgch_accordion_list/AccordionListPar/sgch_accordion/AccordionPar/sgch_downloadlist/DownloadListPar/sgch_download_1858344745.ocFile/SGnP2017_installieren_unix_32bit.sh
 url_archive = https://web.archive.org/web/20210216211355/https://steuersoftware.sg.oca.ch/Steuern_2017/SGnP2017_installieren_unix_32bit.sh
diff --git a/type/__dtnrch_etax_sgnp/files/versions/2018/META.ini b/type/__dtnrch_etax_sgnp/files/versions/2018/META.ini
index 7607690..3674bc5 100644
--- a/type/__dtnrch_etax_sgnp/files/versions/2018/META.ini
+++ b/type/__dtnrch_etax_sgnp/files/versions/2018/META.ini
@@ -4,7 +4,7 @@ java = 1.8.0_181
 java_min = 1.8.0
 update_url = https://updates.information-factory.com/egov/sgnp/updates-SGnP2018.xml
 
-[win32]
+[win-x86@32]
 url = https://steuersoftware.sg.oca.ch/Steuern_2018/SGnP2018_installieren_windows.exe
 url_alt = https://www.sg.ch/steuern-finanzen/steuern/elektronische-steuererklaerung/etaxes-privatpersonen/download-elektronische-steuererklaerung-frueherer-jahre/_jcr_content/Par/sgch_accordion_list/AccordionListPar/sgch_accordion_copy_/AccordionPar/sgch_downloadlist/DownloadListPar/sgch_download.ocFile/SGnP2018_installieren_windows.exe
 url_archive = https://web.archive.org/web/20210216205305/https://steuersoftware.sg.oca.ch/Steuern_2018/SGnP2018_installieren_windows.exe
@@ -14,7 +14,7 @@ sha256sum = eeef0b5577a92dfcbb6d9ac3e8c71f767f5b4668b24d57882bc486b58a82372d
 default_install_dir = C:\Program Files (x86)\Steuer St.Gallen 2018 nP
 java = 1.8.0_181-b13
 
-[macosx]
+[macosx-x86@64]
 url = https://steuersoftware.sg.oca.ch/Steuern_2018/SGnP2018_installieren_macos.dmg
 url_alt = https://www.sg.ch/steuern-finanzen/steuern/elektronische-steuererklaerung/etaxes-privatpersonen/download-elektronische-steuererklaerung-frueherer-jahre/_jcr_content/Par/sgch_accordion_list/AccordionListPar/sgch_accordion_copy_/AccordionPar/sgch_downloadlist/DownloadListPar/sgch_download_737298454.ocFile/SGnP2018_installieren_macos.dmg
 url_archive = https://web.archive.org/web/20210216205619/https://steuersoftware.sg.oca.ch/Steuern_2018/SGnP2018_installieren_macos.dmg
@@ -24,7 +24,7 @@ sha256sum = 8ad189e9cd6480e0d7e30d49e7ff7fdb1428dbf143b2fa269bb829de653aaf7b
 default_install_dir = /Applications/Steuer St.Gallen 2018 nP
 java = 1.8.0_181-b13
 
-[unix64]
+[unix-x86@64]
 url = https://steuersoftware.sg.oca.ch/Steuern_2018/SGnP2018_installieren_unix_64bit.sh
 url_alt = https://www.sg.ch/steuern-finanzen/steuern/elektronische-steuererklaerung/etaxes-privatpersonen/download-elektronische-steuererklaerung-frueherer-jahre/_jcr_content/Par/sgch_accordion_list/AccordionListPar/sgch_accordion_copy_/AccordionPar/sgch_downloadlist/DownloadListPar/sgch_download_1858344745.ocFile/SGnP2018_installieren_unix_64bit.sh
 url_archive = https://web.archive.org/web/20210216210109/https://steuersoftware.sg.oca.ch/Steuern_2018/SGnP2018_installieren_unix_64bit.sh
diff --git a/type/__dtnrch_etax_sgnp/files/versions/2019/META.ini b/type/__dtnrch_etax_sgnp/files/versions/2019/META.ini
index 29dbee2..257ec1b 100644
--- a/type/__dtnrch_etax_sgnp/files/versions/2019/META.ini
+++ b/type/__dtnrch_etax_sgnp/files/versions/2019/META.ini
@@ -4,7 +4,7 @@ java = 1.8.0_181
 java_min = 1.8.0
 update_url = https://updates.information-factory.com/egov/sgnp/updates-SGnP2019.xml
 
-[win32]
+[win-x86@32]
 url = https://steuersoftware.sg.oca.ch/Steuern_2019/SGnP2019_installieren_windows.exe
 url_alt = https://www.sg.ch/steuern-finanzen/steuern/elektronische-steuererklaerung/etaxes-privatpersonen/download-elektronische-steuererklaerung-frueherer-jahre/_jcr_content/Par/sgch_accordion_list/AccordionListPar/sgch_accordion_93436563/AccordionPar/sgch_downloadlist/DownloadListPar/sgch_download.ocFile/SGnP2019_installieren_windows.exe
 url_archive = https://web.archive.org/web/20210212133713/https://steuersoftware.sg.oca.ch/Steuern_2019/SGnP2019_installieren_windows.exe
@@ -14,7 +14,7 @@ sha256sum = 84c3d4fa542d773ffb0c41fdf0a58be9a3ba4635149c9cdfd9d35d251ae173c3
 default_install_dir = C:\Program Files (x86)\Steuer St.Gallen 2019 nP
 java = 1.8.0_181-b13
 
-[macosx]
+[macosx-x86@64]
 url = https://steuersoftware.sg.oca.ch/Steuern_2019/SGnP2019_installieren_macos.dmg
 url_alt = https://www.sg.ch/steuern-finanzen/steuern/elektronische-steuererklaerung/etaxes-privatpersonen/download-elektronische-steuererklaerung-frueherer-jahre/_jcr_content/Par/sgch_accordion_list/AccordionListPar/sgch_accordion_93436563/AccordionPar/sgch_downloadlist/DownloadListPar/sgch_download_264805824.ocFile/SGnP2019_installieren_macos.dmg
 url_archive = https://web.archive.org/web/20210212133647/https://steuersoftware.sg.oca.ch/Steuern_2019/SGnP2019_installieren_macos.dmg
@@ -24,7 +24,7 @@ sha256sum = 60e3004431f13b93fc84a354146eea6c052a31225f4ba9e271e1f95920371f8f
 default_install_dir = /Applications/Steuer St.Gallen 2019 nP
 java = 1.8.0_181-b13
 
-[unix64]
+[unix-x86@64]
 url = https://steuersoftware.sg.oca.ch/Steuern_2019/SGnP2019_installieren_unix_64bit.sh
 url_alt = https://www.sg.ch/steuern-finanzen/steuern/elektronische-steuererklaerung/etaxes-privatpersonen/download-elektronische-steuererklaerung-frueherer-jahre/_jcr_content/Par/sgch_accordion_list/AccordionListPar/sgch_accordion_93436563/AccordionPar/sgch_downloadlist/DownloadListPar/sgch_download_1734889394.ocFile/SGnP2019_installieren_unix_64bit.sh
 url_archive = https://web.archive.org/web/20210212133844/https://steuersoftware.sg.oca.ch/Steuern_2019/SGnP2019_installieren_unix_64bit.sh
diff --git a/type/__dtnrch_etax_sgnp/files/versions/2020/META.ini b/type/__dtnrch_etax_sgnp/files/versions/2020/META.ini
index 557c4bb..87ca796 100644
--- a/type/__dtnrch_etax_sgnp/files/versions/2020/META.ini
+++ b/type/__dtnrch_etax_sgnp/files/versions/2020/META.ini
@@ -4,7 +4,7 @@ java = 1.8.0_181
 java_min = 1.8.0
 update_url = https://updates.information-factory.com/egov/sgnp/updates-SGnP2020.xml
 
-[win32]
+[win-x86@32]
 url = https://steuersoftware.sg.oca.ch/Steuern_2020/SGnP2020_installieren_windows.exe
 url_archive = https://web.archive.org/web/20210320204315/https://steuersoftware.sg.oca.ch/Steuern_2020/SGnP2020_installieren_windows.exe
 filename = SGnP2020_installieren_windows.exe
@@ -13,7 +13,7 @@ cksum = 2704942702 90146480
 default_install_dir = C:\Program Files (x86)\Steuer St.Gallen 2020 nP
 java = 1.8.0_181-b13
 
-[macosx]
+[macosx-x86@64]
 url = https://steuersoftware.sg.oca.ch/Steuern_2020/SGnP2020_installieren_macos.dmg
 url_archive = http://web.archive.org/web/20210321194825/https://steuersoftware.sg.oca.ch/Steuern_2020/SGnP2020_installieren_macos.dmg
 filename = SGnP2020_installieren_macos.dmg
@@ -22,7 +22,7 @@ cksum = 1812106978 98398768
 default_install_dir = /Applications/Steuer St.Gallen 2020 nP
 java = 1.8.0_181-b13
 
-[unix64]
+[unix-x86@64]
 url = https://steuersoftware.sg.oca.ch/Steuern_2020/SGnP2020_installieren_unix_64bit.sh
 url_archive = https://web.archive.org/web/20210320204419/https://steuersoftware.sg.oca.ch/Steuern_2020/SGnP2020_installieren_unix_64bit.sh
 filename = SGnP2020_installieren_unix_64bit.sh
diff --git a/type/__dtnrch_etax_sgnp/files/versions/2021/META.ini b/type/__dtnrch_etax_sgnp/files/versions/2021/META.ini
index 2c417e5..cad3bf8 100644
--- a/type/__dtnrch_etax_sgnp/files/versions/2021/META.ini
+++ b/type/__dtnrch_etax_sgnp/files/versions/2021/META.ini
@@ -4,7 +4,7 @@ java = 1.8.0_181
 java_min = 1.8.0
 update_url = https://updates.information-factory.com/egov/sgnp/updates-SGnP2021.xml
 
-[win32]
+[win-x86@32]
 url_alt = https://www.sg.ch/steuern-finanzen/steuern/elektronische-steuererklaerung/etaxes-privatpersonen/download-elektronische-steuererklaerung-frueherer-jahre/_jcr_content/Par/sgch_accordion_list/AccordionListPar/sgch_accordion_259328206/AccordionPar/sgch_downloadlist/DownloadListPar/sgch_download.ocFile/SGnP2021_windows-x32.exe
 url_archive = http://web.archive.org/web/20230116220802if_/https://www.sg.ch/steuern-finanzen/steuern/elektronische-steuererklaerung/etaxes-privatpersonen/download-elektronische-steuererklaerung-frueherer-jahre/_jcr_content/Par/sgch_accordion_list/AccordionListPar/sgch_accordion_259328206/AccordionPar/sgch_downloadlist/DownloadListPar/sgch_download.ocFile/SGnP2021_windows-x32.exe
 filename = SGnP2021_windows-x32.exe
@@ -13,7 +13,7 @@ cksum = 3053468585 93787784
 default_install_dir = C:\Program Files (x86)\Steuer St.Gallen 2021 nP
 java = 1.8.0_181-b13
 
-[macosx]
+[macosx-x86@64]
 url_alt = https://www.sg.ch/steuern-finanzen/steuern/elektronische-steuererklaerung/etaxes-privatpersonen/download-elektronische-steuererklaerung-frueherer-jahre/_jcr_content/Par/sgch_accordion_list/AccordionListPar/sgch_accordion_259328206/AccordionPar/sgch_downloadlist/DownloadListPar/sgch_download_2099796698.ocFile/SGnP2021_macos.dmg
 url_archive = http://web.archive.org/web/20230116215720if_/https://www.sg.ch/steuern-finanzen/steuern/elektronische-steuererklaerung/etaxes-privatpersonen/download-elektronische-steuererklaerung-frueherer-jahre/_jcr_content/Par/sgch_accordion_list/AccordionListPar/sgch_accordion_259328206/AccordionPar/sgch_downloadlist/DownloadListPar/sgch_download_2099796698.ocFile/SGnP2021_macos.dmg
 filename = SGnP2021_macos.dmg
@@ -22,7 +22,7 @@ cksum = 2172852591 102036017
 default_install_dir = /Applications/Steuer St.Gallen 2021 nP
 java = 1.8.0_181-b13
 
-[unix64]
+[unix-x86@64]
 url_alt = https://www.sg.ch/steuern-finanzen/steuern/elektronische-steuererklaerung/etaxes-privatpersonen/download-elektronische-steuererklaerung-frueherer-jahre/_jcr_content/Par/sgch_accordion_list/AccordionListPar/sgch_accordion_259328206/AccordionPar/sgch_downloadlist/DownloadListPar/sgch_download_160057834.ocFile/SGnP2021_unix_64bit.sh
 url_archive = http://web.archive.org/web/20230116215637if_/https://www.sg.ch/steuern-finanzen/steuern/elektronische-steuererklaerung/etaxes-privatpersonen/download-elektronische-steuererklaerung-frueherer-jahre/_jcr_content/Par/sgch_accordion_list/AccordionListPar/sgch_accordion_259328206/AccordionPar/sgch_downloadlist/DownloadListPar/sgch_download_160057834.ocFile/SGnP2021_unix_64bit.sh
 filename = SGnP2021_unix_64bit.sh
diff --git a/type/__dtnrch_etax_sgnp/files/versions/2022/META.ini b/type/__dtnrch_etax_sgnp/files/versions/2022/META.ini
index c73f1e4..0b3f5a8 100644
--- a/type/__dtnrch_etax_sgnp/files/versions/2022/META.ini
+++ b/type/__dtnrch_etax_sgnp/files/versions/2022/META.ini
@@ -4,7 +4,7 @@ java = 1.11.0
 java_min = 1.8.0
 update_url = https://updates.information-factory.com/egov/sgnp/updates-SGnP2022.xml
 
-[win32]
+[win-x86@32]
 url = https://steuersoftware.sg.oca.ch/Steuern_2022/SGnP2022_installieren_windows.exe
 url_archive = http://web.archive.org/web/20230129214925if_/https://steuersoftware.sg.oca.ch/Steuern_2022/SGnP2022_installieren_windows.exe
 filename = SGnP2022_installieren_windows.exe
@@ -12,7 +12,7 @@ sha256sum = fd61031f18cf197f983759aaba6e59e9d6bfcb0b5e3c2949c7b46099024ee98d
 cksum = 1421502490 105589640
 default_install_dir = C:\Program Files (x86)\Steuer St.Gallen 2022 nP
 
-[macosx]
+[macosx-x86@64]
 url = https://steuersoftware.sg.oca.ch/Steuern_2022/SGnP2022_installieren_macos.dmg
 url_archive = http://web.archive.org/web/20230129220751if_/https://steuersoftware.sg.oca.ch/Steuern_2022/SGnP2022_installieren_macos.dmg
 filename = SGnP2022_installieren_macos.dmg
@@ -20,7 +20,7 @@ sha256sum = de40721590a450ee6c7457bd20f4d89a2f5ebbe3866d03d6eff1b2cec09684e8
 cksum = 3292245707 104562912
 default_install_dir = /Applications/Steuer St.Gallen 2022 nP
 
-[unix64]
+[unix-x86@64]
 url = https://steuersoftware.sg.oca.ch/Steuern_2022/SGnP2022_installieren_unix_64bit.sh
 url_archive = http://web.archive.org/web/20230129215151if_/https://steuersoftware.sg.oca.ch/Steuern_2022/SGnP2022_installieren_unix_64bit.sh
 filename = SGnP2022_installieren_unix_64bit.sh
diff --git a/type/__dtnrch_etax_sgnp/manifest b/type/__dtnrch_etax_sgnp/manifest
index 8993a1b..3ae66a0 100755
--- a/type/__dtnrch_etax_sgnp/manifest
+++ b/type/__dtnrch_etax_sgnp/manifest
@@ -148,6 +148,8 @@ then
 		unset v1 v2
 
 		if version_ge "${jvm_ver:-0}" "${java_min_ver}"; then break; fi
+
+		# TODO: select better matching version
 	done
 	exec 3<&-