diff --git a/apps/simon/0.3.4/.env.sample b/apps/simon/0.3.5/.env.sample similarity index 100% rename from apps/simon/0.3.4/.env.sample rename to apps/simon/0.3.5/.env.sample diff --git a/apps/simon/0.3.4/data.yml b/apps/simon/0.3.5/data.yml similarity index 100% rename from apps/simon/0.3.4/data.yml rename to apps/simon/0.3.5/data.yml diff --git a/apps/simon/0.3.4/data/.gitkeep b/apps/simon/0.3.5/data/.gitkeep similarity index 100% rename from apps/simon/0.3.4/data/.gitkeep rename to apps/simon/0.3.5/data/.gitkeep diff --git a/apps/simon/0.3.4/docker-compose.yml b/apps/simon/0.3.5/docker-compose.yml similarity index 95% rename from apps/simon/0.3.4/docker-compose.yml rename to apps/simon/0.3.5/docker-compose.yml index faf48c816..935bb13f2 100644 --- a/apps/simon/0.3.4/docker-compose.yml +++ b/apps/simon/0.3.5/docker-compose.yml @@ -1,6 +1,6 @@ services: simon: - image: "alibahmanyar/simon:0.3.4" + image: "alibahmanyar/simon:0.3.5" container_name: ${CONTAINER_NAME} restart: unless-stopped networks: diff --git a/apps/simon/0.3.4/scripts/init.sh b/apps/simon/0.3.5/scripts/init.sh similarity index 90% rename from apps/simon/0.3.4/scripts/init.sh rename to apps/simon/0.3.5/scripts/init.sh index 2b0ea5cf1..fbd7105a8 100755 --- a/apps/simon/0.3.4/scripts/init.sh +++ b/apps/simon/0.3.5/scripts/init.sh @@ -9,21 +9,31 @@ fail() { exit 1 } -read_env_value() { - local key="$1" - local value="" - value="$(sed -n "s/^${key}=//p" "$ENV_FILE" | tail -n 1)" +unquote_value() { + local value="$1" case "$value" in \"*\") value="${value#\"}"; value="${value%\"}" ;; \'*\') value="${value#\'}"; value="${value%\'}" ;; esac + value="${value//\\\$/\$}" printf '%s\n' "$value" } +read_env_value() { + local key="$1" + local value="" + value="$(sed -n "s/^${key}=//p" "$ENV_FILE" | tail -n 1)" + unquote_value "$value" +} + effective_value() { local key="$1" + local value="" if [[ -v "$key" ]]; then - printf '%s\n' "${!key}" + value="${!key}" + fi + if [[ -n "$value" ]]; then + unquote_value "$value" else read_env_value "$key" fi diff --git a/apps/simon/0.3.4/scripts/uninstall.sh b/apps/simon/0.3.5/scripts/uninstall.sh similarity index 100% rename from apps/simon/0.3.4/scripts/uninstall.sh rename to apps/simon/0.3.5/scripts/uninstall.sh diff --git a/apps/simon/0.3.4/scripts/upgrade.sh b/apps/simon/0.3.5/scripts/upgrade.sh similarity index 100% rename from apps/simon/0.3.4/scripts/upgrade.sh rename to apps/simon/0.3.5/scripts/upgrade.sh