From 30044b374fa1076ff2950e587de596069af3e8bf Mon Sep 17 00:00:00 2001
From: Anish Mehta <mehtaanish111@gmail.com>
Date: Sun, 20 Sep 2026 01:56:01 +0530
Subject: [PATCH] Fix replace-conf-from-env.sh word-splitting env values into
 junk config lines

`replace_configs` iterated over the unquoted output of `env`, so any
variable whose value contains whitespace (JAVA_TOOL_OPTIONS, a
multi-word SOME_VAR, ...) was split into words, and every lowercase word
was appended to iotdb-system.properties as its own line. The junk also
shifted the line numbers the sed edits rely on, and `_=/usr/bin/env` from
bash slipped through the intended `_` filter.

Iterate over exported variable names (`compgen -e`) and read each value
through indirection instead, quote the paths and values passed to
process_single, and replace an existing key with `sed Nc` rather than
delete + append: the latter silently dropped the override when the key
was on the last line of the file.

Closes #18655
---
 .../DockerCompose/replace-conf-from-env.sh    | 41 ++++++++++++-------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/docker/src/main/DockerCompose/replace-conf-from-env.sh b/docker/src/main/DockerCompose/replace-conf-from-env.sh
index 416bd0d385604..846ae038d7ece 100755
--- a/docker/src/main/DockerCompose/replace-conf-from-env.sh
+++ b/docker/src/main/DockerCompose/replace-conf-from-env.sh
@@ -33,32 +33,45 @@ echo "target_files=$target_files"
 
 function process_single(){
 	local key_value="$1"
-	local filename=$2
-	local key=$(echo $key_value|cut -d = -f1)
-	local line=$(grep -ni "${key}=" ${filename})
+	local filename="$2"
+	local key="${key_value%%=*}"
+	local line=$(grep -ni "${key}=" "${filename}")
 	#echo "line=$line"
 	if [[ -n "${line}" ]]; then
     echo "update $key_value $filename"
-    local line_no=$(echo $line|cut -d : -f1)
-    local content=$(echo $line|cut -d : -f2)
+    local line_no=$(echo "$line"|cut -d : -f1)
+    local content=$(echo "$line"|cut -d : -f2)
     if [[ "${content:0:1}" != "#" ]]; then
-      sed -i "${line_no}d" ${filename}
+      # Replace the line in place. Deleting it and appending after the same
+      # line number lost the value when the key was on the last line.
+      sed -i "${line_no}c${key_value}" "${filename}"
+    else
+      sed -i "${line_no}a${key_value}" "${filename}"
     fi
-    sed -i "${line_no}a${key_value}" ${filename}
   else
     echo "append $key_value $filename"
-    line_no=$(wc -l $filename|cut -d ' ' -f1)
-    sed -i "${line_no}a${key_value}" ${filename}
+    sed -i "\$a${key_value}" "${filename}"
 	fi
 }
 
 function replace_configs(){
-  for v in $(env); do
-    key_name="${v%%=*}"
-    if [[ "${key_name}" == "${key_name,,}" && ! 2w$key_name =~ ^_ ]]; then
-#      echo "###### $v ####"
+  # Iterate over the exported variable names instead of the output of `env`:
+  # a value that contains whitespace (e.g. JAVA_TOOL_OPTIONS="-Xms1g -Xmx2g")
+  # would otherwise be split into words, and every lowercase word would be
+  # appended to the properties file as a junk line, shifting the line
+  # numbers the sed edits below rely on.
+  local key_name value
+  for key_name in $(compgen -e); do
+    # Only lowercase names are IoTDB config keys; skip bash internals such as `_`.
+    if [[ "${key_name}" == "${key_name,,}" && "${key_name}" != _* ]]; then
+      value="${!key_name}"
+      if [[ "${value}" == *$'\n'* ]]; then
+        echo "skip ${key_name}: multi-line values are not supported"
+        continue
+      fi
+#      echo "###### $key_name=$value ####"
       for f in ${target_files}; do
-          process_single $v ${conf_path}/$f
+          process_single "${key_name}=${value}" "${conf_path}/$f"
       done
     fi
   done