Merge remote-tracking branch 'origin/pull/328'

* origin/pull/328: contrib: support trailing commas in sbctl setup output
Foxboron · Jul 28, 2024 · 2403f4f · 2403f4f
2 parents 4f31817 + ef2c081
commit 2403f4f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/contrib/kernel-install/91-sbctl.install b/contrib/kernel-install/91-sbctl.install
@@ -31,7 +31,7 @@ add)
 
 	# exit without error if keys don't exist
 	# https://github.com/Foxboron/sbctl/issues/187
-	if ! [ "$(sbctl setup --print-state --json | grep installed | awk '{print $2}')" = "true" ]; then
+	if ! [ "$(sbctl setup --print-state --json | awk '/installed/ { gsub(/,$/,"",$2); print $2 }')" = "true" ]; then
 		echo "Secureboot key directory doesn't exist, not signing!"
 		exit 0
 	fi

diff --git a/contrib/mkinitcpio/sbctl b/contrib/mkinitcpio/sbctl
@@ -3,7 +3,7 @@
 KERNEL_FILE="$1"
 UKI_FILE="$3"
 
-if ! [ "$(sbctl setup --print-state --json | grep installed | awk '{print $2}')" = "true" ]; then
+if ! [ "$(sbctl setup --print-state --json | awk '/installed/ { gsub(/,$/,"",$2); print $2 }')" = "true" ]; then
     echo "Secureboot key directory doesn't exist, not signing!"
     exit 0
 fi