diff --git a/lidarr.sh b/lidarr.sh
index 96f171c..aa21567 100755
--- a/lidarr.sh
+++ b/lidarr.sh
@@ -70,7 +70,7 @@ for ((i = 1; i < ${#tarballs[@]}; i += 2)); do
 	if [[ "$arch" == "core-arm64" ]]; then
 		arch="arm64"
 	fi
-	if [ -z "$1" ] || [[ "$arch" == "$1" ]]; then
+	if [ $# -eq 0 ] || (( $@[(Ie)$arch])); then
 		echo "Building for $arch..."
 		dir=$(mktemp -d)
 		current_dir=$PWD
diff --git a/prowlarr.sh b/prowlarr.sh
index ea41276..52e0cc9 100755
--- a/prowlarr.sh
+++ b/prowlarr.sh
@@ -63,7 +63,7 @@ for ((i = 1; i < ${#tarballs[@]}; i += 2)); do
 	if [[ "$arch" == "core-arm64" ]]; then
 		arch="arm64"
 	fi
-	if [ -z "$1" ] || [[ "$arch" == "$1" ]]; then
+	if [ $# -eq 0 ] || (( $@[(Ie)$arch])); then
 		echo "Building for $arch..."
 		dir=$(mktemp -d)
 		current_dir=$PWD
diff --git a/radarr.sh b/radarr.sh
index 4d01f6b..55f163c 100755
--- a/radarr.sh
+++ b/radarr.sh
@@ -68,7 +68,7 @@ for ((i = 1; i < ${#tarballs[@]}; i += 2)); do
 	if [[ "$arch" == "core-arm64" ]]; then
 		arch="arm64"
 	fi
-	if [ -z "$1" ] || [[ "$arch" == "$1" ]]; then
+	if [ $# -eq 0 ] || (( $@[(Ie)$arch])); then
 		echo "Building for $arch..."
 		dir=$(mktemp -d)
 		current_dir=$PWD
diff --git a/readarr.sh b/readarr.sh
index 933ff64..64285ce 100755
--- a/readarr.sh
+++ b/readarr.sh
@@ -68,7 +68,7 @@ for ((i = 1; i < ${#tarballs[@]}; i += 2)); do
 	if [[ "$arch" == "core-arm64" ]]; then
 		arch="arm64"
 	fi
-	if [ -z "$1" ] || [[ "$arch" == "$1" ]]; then
+	if [ $# -eq 0 ] || (( $@[(Ie)$arch])); then
 		echo "Building for $arch..."
 		dir=$(mktemp -d)
 		current_dir=$PWD
diff --git a/sonarr.sh b/sonarr.sh
index 97cc3bc..315b3ec 100755
--- a/sonarr.sh
+++ b/sonarr.sh
@@ -64,7 +64,7 @@ for ((i = 1; i < ${#tarballs[@]}; i += 2)); do
 	if [[ "$arch" == "arm" ]]; then
 		arch="armhf"
 	fi
-	if [ -z "$1" ] || [[ "$arch" == "$1" ]]; then
+	if [ $# -eq 0 ] || (( $@[(Ie)$arch])); then
 		echo "Building for $arch..."
 		dir=$(mktemp -d)
 		current_dir=$PWD