From 7afeca2a812e77b340aa755da2b47718ab970990 Mon Sep 17 00:00:00 2001
From: Mike Tesch <mitesch@github.com>
Date: Mon, 15 Dec 2025 12:59:17 -0500
Subject: [PATCH] Fix typo and a couple minor log updates (#13436)

---
 images/ubuntu-slim/scripts/build/configure-apt.sh     | 2 +-
 images/ubuntu-slim/scripts/helpers/etc-environment.sh | 2 +-
 images/ubuntu-slim/scripts/helpers/install.sh         | 4 ++--
 images/ubuntu-slim/test.sh                            | 5 ++++-
 images/ubuntu/scripts/helpers/etc-environment.sh      | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/images/ubuntu-slim/scripts/build/configure-apt.sh b/images/ubuntu-slim/scripts/build/configure-apt.sh
index 5b9c56f5e..849a1449c 100644
--- a/images/ubuntu-slim/scripts/build/configure-apt.sh
+++ b/images/ubuntu-slim/scripts/build/configure-apt.sh
@@ -50,4 +50,4 @@ apt-get update
 # Install jq
 apt-get install jq
 
-echo "ubuntu ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
\ No newline at end of file
+echo "ubuntu ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
diff --git a/images/ubuntu-slim/scripts/helpers/etc-environment.sh b/images/ubuntu-slim/scripts/helpers/etc-environment.sh
index 3261ccacb..8673e4c3b 100644
--- a/images/ubuntu-slim/scripts/helpers/etc-environment.sh
+++ b/images/ubuntu-slim/scripts/helpers/etc-environment.sh
@@ -78,7 +78,7 @@ append_etc_environment_path() {
 #    /etc/environment
 #
 # TODO: there might be the others variables to be processed in the same way as "PATH" variable
-#       ie MANPATH, INFOPATH, LD_*, etc. In the current implementation the values from /etc/evironments
+#       ie MANPATH, INFOPATH, LD_*, etc. In the current implementation the values from /etc/environment
 #       replace the values of the current environment
 reload_etc_environment() {
     # add `export ` to every variable of /etc/environment except PATH and eval the result shell script
diff --git a/images/ubuntu-slim/scripts/helpers/install.sh b/images/ubuntu-slim/scripts/helpers/install.sh
index cc71189da..005fe6924 100644
--- a/images/ubuntu-slim/scripts/helpers/install.sh
+++ b/images/ubuntu-slim/scripts/helpers/install.sh
@@ -231,7 +231,7 @@ use_checksum_comparison() {
         echo "Checksum verification failed. Expected hash: $checksum; Actual hash: $local_file_hash."
         exit 1
     else
-        echo "Checksum verification passed"
+        echo "Checksum verification passed. Expected hash: $checksum; Actual hash: $local_file_hash."
     fi
 }
 
@@ -240,4 +240,4 @@ get_toolset_value() {
     local query=$1
 
     echo "$(jq -r "$query" $toolset_path)"
-}
\ No newline at end of file
+}
diff --git a/images/ubuntu-slim/test.sh b/images/ubuntu-slim/test.sh
index 784d69154..bb9054f1f 100755
--- a/images/ubuntu-slim/test.sh
+++ b/images/ubuntu-slim/test.sh
@@ -51,7 +51,10 @@ run_test() {
 # Build the image only if using the default name (for backward compatibility)
 if [[ "$IMAGE_NAME" == "ubuntu-slim:test" ]]; then
     echo "Building image: $IMAGE_NAME"
-    docker build --debug --progress plain -t "$IMAGE_NAME" .
+    if ! docker build --no-cache --debug --progress plain -t "$IMAGE_NAME" .; then
+        echo "Error: Docker build failed"
+        exit 1
+    fi
 else
     # Check if the image exists
     if ! docker image inspect "$IMAGE_NAME" >/dev/null 2>&1; then
diff --git a/images/ubuntu/scripts/helpers/etc-environment.sh b/images/ubuntu/scripts/helpers/etc-environment.sh
index 3261ccacb..8673e4c3b 100644
--- a/images/ubuntu/scripts/helpers/etc-environment.sh
+++ b/images/ubuntu/scripts/helpers/etc-environment.sh
@@ -78,7 +78,7 @@ append_etc_environment_path() {
 #    /etc/environment
 #
 # TODO: there might be the others variables to be processed in the same way as "PATH" variable
-#       ie MANPATH, INFOPATH, LD_*, etc. In the current implementation the values from /etc/evironments
+#       ie MANPATH, INFOPATH, LD_*, etc. In the current implementation the values from /etc/environment
 #       replace the values of the current environment
 reload_etc_environment() {
     # add `export ` to every variable of /etc/environment except PATH and eval the result shell script