Fix shellcheck issues

Dynatrace · Dec 13, 2024 · ba1ba91 · ba1ba91
1 parent 563e7aa
commit ba1ba91
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/roles/oneagent/tests/command/windows/windows_command_wrapper.py b/roles/oneagent/tests/command/windows/windows_command_wrapper.py
@@ -13,7 +13,7 @@ def get_file_content(self, address: str, file: Path) -> CommandResult:
         return self.executor.execute(address, "type", str(file))
 
     def file_exists(self, address: str, file: Path) -> CommandResult:
-        # Windows needs double quoting for passing paths containing
+        # Windows needs double quoting for passing paths
         # containing spaces, single quotes don't work
         return self.executor.execute(
             address, f'if exist "{file}" (exit 0) else (exit 1)')

diff --git a/roles/oneagent/tests/resources/installers/Dynatrace-OneAgent-Linux.sh b/roles/oneagent/tests/resources/installers/Dynatrace-OneAgent-Linux.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash -eu
 
 # This script acts as a self contained installer of the procuct
 
@@ -9,16 +9,18 @@ readonly INSTALLER_VERSION="##VERSION##"
 readonly DEPLOYMENT_CONF_PATH="/var/lib/dynatrace/oneagent/agent/config"
 
 readonly UNINSTALL_SCRIPT="uninstall.sh"
-readonly UNINSTALL_CODE="$(cat <<-ENDUNINSTALL
+UNINSTALL_CODE="$(cat <<-ENDUNINSTALL
 ##UNINSTALL_CODE##
 ENDUNINSTALL
 )"
+readonly UNINSTALL_CODE
 
 readonly ONEAGENTCTL_BIN="oneagentctl"
-readonly ONEAGENTCTL_CODE="$(cat <<-ENDCTL
+ONEAGENTCTL_CODE="$(cat <<-ENDCTL
 ##ONEAGENTCTL_CODE##
 ENDCTL
 )"
+readonly ONEAGENTCTL_CODE
 
 CTL_PARAMS=
 INSTALL_DIR="${DEFAULT_INSTALL_DIR}"
@@ -61,7 +63,7 @@ deployUninstallScript() {
 }
 
 applyConfig() {
-	"${INSTALL_DIR}/agent/tools/${ONEAGENTCTL_BIN}" ${CTL_PARAMS}
+	"${INSTALL_DIR}/agent/tools/${ONEAGENTCTL_BIN}" "${CTL_PARAMS}"
 }
 
 main() {

diff --git a/roles/oneagent/tests/resources/installers/oneagentctl.sh b/roles/oneagent/tests/resources/installers/oneagentctl.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -eu
 
 # This file simulates deployment functionalities of oneagentctl binary, used to configure installation.
 

diff --git a/roles/oneagent/tests/resources/installers/uninstall.sh b/roles/oneagent/tests/resources/installers/uninstall.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash -eu
 
 # This file simulates the basic behavior of the uninstall.sh script