robojerk/ComposeSync
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix TOML parser comment handling and variable expansion issues

Browse source
This commit is contained in:
robojerk 2025-06-25 16:01:56 -07:00
parent 9c70e75c78
commit 3c3e280c9d
2 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
config-parser.sh
View file

@ -47,6 +47,13 @@ parse_toml() {
# Remove quotes from value # Remove quotes from value
value=$(echo "$value" | sed 's/^"\(.*\)"$/\1/' | sed "s/^'\(.*\)'$/\1/") value=$(echo "$value" | sed 's/^"\(.*\)"$/\1/' | sed "s/^'\(.*\)'$/\1/")
# Remove inline comments (everything after #)
value=$(echo "$value" | sed 's/[[:space:]]*#.*$//')
# Trim whitespace
key=$(echo "$key" | xargs)
value=$(echo "$value" | xargs)
# Convert to environment variable format # Convert to environment variable format
if [ -n "$current_section" ]; then if [ -n "$current_section" ]; then
if [[ "$current_section" == "global" ]]; then if [[ "$current_section" == "global" ]]; then

18
update-agent.sh
View file

@ -296,15 +296,15 @@ process_stack() {
local git_ref_var="STACK_${stack_num}_GIT_REF" local git_ref_var="STACK_${stack_num}_GIT_REF"
local compose_filename_var="STACK_${stack_num}_COMPOSE_FILENAME" local compose_filename_var="STACK_${stack_num}_COMPOSE_FILENAME"
local name=${!name_var} local name="${!name_var:-}"
local url=${!url_var} local url="${!url_var:-}"
local path=${!path_var} local path="${!path_var:-}"
local tool=${!tool_var} local tool="${!tool_var:-}"
local interval=${!interval_var:-$UPDATE_INTERVAL} local interval="${!interval_var:-$UPDATE_INTERVAL}"
local keep_versions=${!keep_versions_var:-$KEEP_VERSIONS} local keep_versions="${!keep_versions_var:-$KEEP_VERSIONS}"
local git_subpath=${!git_subpath_var} local git_subpath="${!git_subpath_var:-}"
local git_ref=${!git_ref_var} local git_ref="${!git_ref_var:-}"
local compose_filename=${!compose_filename_var} local compose_filename="${!compose_filename_var:-}"
if [ -z "$name" ] || [ -z "$url" ] || [ -z "$path" ] || [ -z "$tool" ]; then if [ -z "$name" ] || [ -z "$url" ] || [ -z "$path" ] || [ -z "$tool" ]; then
log "Error: Missing required configuration for stack $stack_num" log "Error: Missing required configuration for stack $stack_num"