Remove unnecessary grep from test scenario scripts

Since the unit is now informed in the for the sysctl list-unit-files, the return code will already be 0 if the unit exists and 1 otherwise. So, this | grep is no longer necessary.
ComplianceAsCode · Jan 6, 2023 · c143373 · c143373
1 parent d87c0a7
commit c143373
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/shared/templates/service_disabled/tests/service_disabled.pass.sh b/shared/templates/service_disabled/tests/service_disabled.pass.sh
@@ -4,13 +4,13 @@
 SYSTEMCTL_EXEC='/usr/bin/systemctl'
 # Some services use <name>@.service style that is not meant to be activated at all,
 # and only used via socket activation.
-if "$SYSTEMCTL_EXEC" list-unit-files '{{{ DAEMONNAME }}}.service' | grep -q '^{{{ DAEMONNAME }}}.service'; then
+if "$SYSTEMCTL_EXEC" -q list-unit-files '{{{ DAEMONNAME }}}.service'; then
     "$SYSTEMCTL_EXEC" stop '{{{ DAEMONNAME }}}.service'
     "$SYSTEMCTL_EXEC" disable '{{{ DAEMONNAME }}}.service'
     "$SYSTEMCTL_EXEC" mask '{{{ DAEMONNAME }}}.service'
 fi
 # Disable socket activation if we have a unit file for it
-if "$SYSTEMCTL_EXEC" list-unit-files '{{{ DAEMONNAME }}}.socket' | grep -q '^{{{ DAEMONNAME }}}.socket'; then
+if "$SYSTEMCTL_EXEC" -q list-unit-files '{{{ DAEMONNAME }}}.socket'; then
     "$SYSTEMCTL_EXEC" stop '{{{ DAEMONNAME }}}.socket'
     "$SYSTEMCTL_EXEC" mask '{{{ DAEMONNAME }}}.socket'
 fi

diff --git a/shared/templates/service_disabled/tests/service_enabled.fail.sh b/shared/templates/service_disabled/tests/service_enabled.fail.sh
@@ -4,13 +4,13 @@
 SYSTEMCTL_EXEC='/usr/bin/systemctl'
 # Some services use <name>@.service style that is not meant to be activated at all,
 # and only used via socket activation.
-if "$SYSTEMCTL_EXEC" list-unit-files '{{{ DAEMONNAME }}}.service' | grep -q '^{{{ DAEMONNAME }}}.service'; then
+if "$SYSTEMCTL_EXEC" -q list-unit-files '{{{ DAEMONNAME }}}.service'; then
     "$SYSTEMCTL_EXEC" unmask '{{{ DAEMONNAME }}}.service'
     "$SYSTEMCTL_EXEC" start '{{{ DAEMONNAME }}}.service'
     "$SYSTEMCTL_EXEC" enable '{{{ DAEMONNAME }}}.service'
 fi
-# Disable socket activation if we have a unit file for it
-if "$SYSTEMCTL_EXEC" list-unit-files '{{{ DAEMONNAME }}}.socket' | grep -q '^{{{ DAEMONNAME }}}.socket'; then
+# Enable socket activation if we have a unit file for it
+if "$SYSTEMCTL_EXEC" -q list-unit-files '{{{ DAEMONNAME }}}.socket'; then
     "$SYSTEMCTL_EXEC" unmask '{{{ DAEMONNAME }}}.socket'
     "$SYSTEMCTL_EXEC" start '{{{ DAEMONNAME }}}.socket'
 fi