Don't sanitize vars at dump when they are marked to keep

sherpalabsio · Feb 15, 2025 · 3f9a426 · 3f9a426
1 parent 05d8539
commit 3f9a426
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 3 deletions.
diff --git a/lib/dump.sh b/lib/dump.sh
@@ -4,7 +4,15 @@ _sherpa_dump_current_env() {
 
 _sherpa_dump_current_env__sanitize() {
   # shellcheck disable=SC2002
-  cat "$SHERPA_ENV_FILENAME" |
-    sed '/^export [^[:space:]]*=/s/=.*/=/' |
-    sed '/^[^[:space:]]*=/s/=.*/=/'
+  cat "$SHERPA_ENV_FILENAME" | while IFS= read -r line; do
+    # Skip if line ends with "# keep"
+    if [[ $line =~ [[:space:]]*#[[:space:]]*keep[[:space:]]*$ ]]; then
+      echo "$line"
+      continue
+    fi
+
+    echo "$line" |
+      sed '/^export [^[:space:]]*=/s/=.*/=/' |
+      sed '/^[^[:space:]]*=/s/=.*/=/'
+  done
 }
diff --git a/tests/features/dump_test.sh b/tests/features/dump_test.sh
@@ -57,3 +57,25 @@ sherpa dump
 actual_env_file=$(cat "$SHERPA_ENV_FILENAME.example")
 
 assert_equal "$actual_env_file" "VAR_1="
+
+# ==============================================================================
+# ++++ It doesn't sanitize the exported variables if marked to keep
+
+overwrite_env_file "export VAR_1=\"local var 1\" # keep"
+
+sherpa dump
+
+actual_env_file=$(cat "$SHERPA_ENV_FILENAME.example")
+
+assert_equal "$actual_env_file" "export VAR_1=\"local var 1\" # keep"
+
+# ==============================================================================
+# ++++ It doesn't sanitize the non-exported variables if marked to keep
+
+overwrite_env_file "VAR_1=\"local var 1\" # keep"
+
+sherpa dump
+
+actual_env_file=$(cat "$SHERPA_ENV_FILENAME.example")
+
+assert_equal "$actual_env_file" "VAR_1=\"local var 1\" # keep"