TEST-68-PROPAGATE-EXIT-STATUS: deobfuscate shell code and fix typo

After the cleanup, it was fairly easy to see the wrong variable name ;)

diff --git a/test/units/testsuite-68.sh b/test/units/testsuite-68.sh
index aa02d66dcfadb2fd91f573026e4de1c62908aeed..c93f8703955d432f0d2904e1c1408d3f1db22dbd 100755 (executable)
--- a/test/units/testsuite-68.sh
+++ b/test/units/testsuite-68.sh
@@ -33,7 +33,7 @@ Description=TEST-68-PROPAGATE-EXIT-STATUS with OnFailure= trigger
 OnFailure=testservice-failure-exit-handler-68.service
 
 [Service]
-ExecStart=/bin/bash -c "exit 1"
+ExecStart=sh -c "exit 1"
 EOF
 
 cat >/run/systemd/system/testservice-failure-68-template.service <<EOF
@@ -42,7 +42,7 @@ Description=TEST-68-PROPAGATE-EXIT-STATUS with OnFailure= trigger (template)
 OnFailure=testservice-failure-exit-handler-68-template@%n.service
 
 [Service]
-ExecStart=/bin/bash -c "exit 1"
+ExecStart=sh -c "exit 1"
 EOF
 
 # Trigger testservice-success-exit-handler-68.service
@@ -52,7 +52,7 @@ Description=TEST-68-PROPAGATE-EXIT-STATUS with OnSuccess= trigger
 OnSuccess=testservice-success-exit-handler-68.service
 
 [Service]
-ExecStart=/bin/bash -c "exit 0"
+ExecStart=sh -c "exit 0"
 EOF
 
 cat >/run/systemd/system/testservice-success-68-template.service <<EOF
@@ -61,42 +61,45 @@ Description=TEST-68-PROPAGATE-EXIT-STATUS with OnSuccess= trigger (template)
 OnSuccess=testservice-success-exit-handler-68-template@%n.service
 
 [Service]
-ExecStart=/bin/bash -c "exit 0"
+ExecStart=sh -c "exit 0"
 EOF
 
 # Script to check that when an OnSuccess= dependency fires, the correct
 # MONITOR* env variables are passed.
-cat >/tmp/check_on_success.sh <<EOF
-#!/usr/bin/env bash
+cat >/tmp/check_on_success.sh <<"EOF"
+#!/bin/sh
 
 set -ex
 env
-if [ "\$MONITOR_SERVICE_RESULT" != "success" ]; then
-    echo "MONITOR_SERVICE_RESULT was \"\$MONITOR_SERVICE_RESULT\", expected \"success\"";
-    exit 1;
+if [ "$MONITOR_SERVICE_RESULT" != "success" ]; then
+    echo "MONITOR_SERVICE_RESULT was '$MONITOR_SERVICE_RESULT', expected 'success'"
+    exit 1
 fi
 
-if [ "\$MONITOR_EXIT_CODE" != "exited" ]; then
-    echo "MONITOR_EXIT_CODE was \"\$MONITOR_EXIT_CODE\", expected \"exited\"";
-    exit 1;
+if [ "$MONITOR_EXIT_CODE" != "exited" ]; then
+    echo "MONITOR_EXIT_CODE was '$MONITOR_EXIT_CODE', expected 'exited'"
+    exit 1
 fi
 
-if [ "\$MONITOR_EXIT_STATUS" != "0" ]; then
-    echo "MONITOR_EXIT_STATUS was \"\$MONITOR_EXIT_STATUS\", expected \"0\"";
-    exit 1;
+if [ "$MONITOR_EXIT_STATUS" != "0" ]; then
+    echo "MONITOR_EXIT_STATUS was '$MONITOR_EXIT_STATUS', expected '0'"
+    exit 1
 fi
 
-if [ -z "\$MONITOR_INVOCATION_ID" ]; then
-    echo "MONITOR_INVOCATION_ID unset";
-    exit 1;
+if [ -z "$MONITOR_INVOCATION_ID" ]; then
+    echo "MONITOR_INVOCATION_ID unset"
+    exit 1
 fi
 
-if [[ "\$MONITOR_UNIT" != "testservice-success-68.service" && "\$UNIT" != "testservice-success-68-template.service" && "\$MONITOR_UNIT" != "testservice-transient-success-68.service" ]]; then
-    echo "MONITOR_UNIT was \"\$MONITOR_UNIT\", expected \"testservice-success-68{-transient}.service\"";
-    exit 1;
+if [ "$MONITOR_UNIT" != "testservice-success-68.service" ] &&
+   [ "$MONITOR_UNIT" != "testservice-success-68-template.service" ] &&
+   [ "$MONITOR_UNIT" != "testservice-transient-success-68.service" ]; then
+
+    echo "MONITOR_UNIT was '$MONITOR_UNIT', expected 'testservice[-transient]-success-68[-template].service'"
+    exit 1
 fi
 
-exit 0;
+exit 0
 EOF
 chmod +x /tmp/check_on_success.sh
 
@@ -123,37 +126,40 @@ EOF
 
 # Script to check that when an OnFailure= dependency fires, the correct
 # MONITOR* env variables are passed.
-cat >/tmp/check_on_failure.sh <<EOF
-#!/usr/bin/env bash
+cat >/tmp/check_on_failure.sh <<"EOF"
+#!/bin/sh
 
 set -ex
 env
-if [ "\$MONITOR_SERVICE_RESULT" != "exit-code" ]; then
-    echo "MONITOR_SERVICE_RESULT was \"\$MONITOR_SERVICE_RESULT\", expected \"exit-code\"";
-    exit 1;
+if [ "$MONITOR_SERVICE_RESULT" != "exit-code" ]; then
+    echo "MONITOR_SERVICE_RESULT was '$MONITOR_SERVICE_RESULT', expected 'exit-code'"
+    exit 1
 fi
 
-if [ "\$MONITOR_EXIT_CODE" != "exited" ]; then
-    echo "MONITOR_EXIT_CODE was \"\$MONITOR_EXIT_CODE\", expected \"exited\"";
-    exit 1;
+if [ "$MONITOR_EXIT_CODE" != "exited" ]; then
+    echo "MONITOR_EXIT_CODE was '$MONITOR_EXIT_CODE', expected 'exited'"
+    exit 1
 fi
 
-if [ "\$MONITOR_EXIT_STATUS" != "1" ]; then
-    echo "MONITOR_EXIT_STATUS was \"\$MONITOR_EXIT_STATUS\", expected \"1\"";
-    exit 1;
+if [ "$MONITOR_EXIT_STATUS" != "1" ]; then
+    echo "MONITOR_EXIT_STATUS was '$MONITOR_EXIT_STATUS', expected '1'"
+    exit 1
 fi
 
-if [ -z "\$MONITOR_INVOCATION_ID" ]; then
-    echo "MONITOR_INVOCATION_ID unset";
-    exit 1;
+if [ -z "$MONITOR_INVOCATION_ID" ]; then
+    echo "MONITOR_INVOCATION_ID unset"
+    exit 1
 fi
 
-if [[ "\$MONITOR_UNIT" != "testservice-failure-68.service" && "\$UNIT" != "testservice-failure-68-template.service" && "\$MONITOR_UNIT" != "testservice-transient-failure-68.service" ]]; then
-    echo "MONITOR_UNIT was \"\$MONITOR_UNIT\", expected \"testservice-failure-68{-transient}.service\"";
-    exit 1;
+if [ "$MONITOR_UNIT" != "testservice-failure-68.service" ] &&
+   [ "$MONITOR_UNIT" != "testservice-failure-68-template.service" ] &&
+   [ "$MONITOR_UNIT" != "testservice-transient-failure-68.service" ]; then
+
+    echo "MONITOR_UNIT was '$MONITOR_UNIT', expected 'testservice[-transient]-failure-68[-template].service'"
+    exit 1
 fi
 
-exit 0;
+exit 0
 EOF
 chmod +x /tmp/check_on_failure.sh
 
@@ -187,9 +193,9 @@ systemctl start testservice-success-68.service
 wait_on_state_or_fail "testservice-success-exit-handler-68.service" "inactive" "10"
 
 # Test some transient units since these exit very quickly.
-systemd-run --unit=testservice-transient-success-68 --property=OnSuccess=testservice-success-exit-handler-68.service /bin/bash -c "exit 0;"
+systemd-run --unit=testservice-transient-success-68 --property=OnSuccess=testservice-success-exit-handler-68.service sh -c "exit 0"
 wait_on_state_or_fail "testservice-success-exit-handler-68.service" "inactive" "10"
-systemd-run --unit=testservice-transient-failure-68 --property=OnFailure=testservice-failure-exit-handler-68.service /bin/bash -c "exit 1;"
+systemd-run --unit=testservice-transient-failure-68 --property=OnFailure=testservice-failure-exit-handler-68.service sh -c "exit 1"
 wait_on_state_or_fail "testservice-failure-exit-handler-68.service" "inactive" "10"
 
 # Test template handlers too