From 5bc0e603a7a1ba74448e05aa1036498e8fd41d0e Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Tue, 20 Aug 2024 15:11:21 +0100 Subject: [PATCH] Fix unquoting of variables - Fix trimming of matching quote (no star after \1 reference) - Only trim a single quote (turn any-match into optional match) --- CHANGELOG.md | 4 ++++ lib/shared-functions.sh | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f5067b1..1df4375 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 2024-08-20 +### Fixed +- Fix unquoting of variables (e.g. `ALL_TEX_LIVE_DOCKER_IMAGES`) + ## 2024-08-13 ### Added - Updated default [`version`](https://github.com/overleaf/toolkit/blob/master/lib/config-seed/version) to `5.1.1`. diff --git a/lib/shared-functions.sh b/lib/shared-functions.sh index 5f8b923..59239eb 100644 --- a/lib/shared-functions.sh +++ b/lib/shared-functions.sh @@ -180,11 +180,11 @@ function check_sharelatex_env_vars() { function read_variable() { local name=$1 grep -E "^$name=" "$TOOLKIT_ROOT/config/variables.env" \ - | sed -r "s/^$name=([\"']*)(.+)\1*\$/\2/" + | sed -r "s/^$name=([\"']?)(.+)\1\$/\2/" } function read_configuration() { local name=$1 grep -E "^$name=" "$TOOLKIT_ROOT/config/overleaf.rc" \ - | sed -r "s/^$name=([\"']*)(.+)\1*\$/\2/" + | sed -r "s/^$name=([\"']?)(.+)\1\$/\2/" }