From a1bb74c998c9d36f67d9a1e72b30b586ebf53360 Mon Sep 17 00:00:00 2001 From: Kevin Manuel Date: Mon, 30 Sep 2024 23:32:50 +0100 Subject: [PATCH 1/2] update regex to support BSD sed (for macOS devs) and GNU sed --- lib/shared-functions.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/shared-functions.sh b/lib/shared-functions.sh index 6ca7c214..7f955312 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=([\"']?)([^\"']+)[\"']?$/\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=([\"']?)([^\"']+)[\"']?$/\2/" } From 5c1bde66ba9f163053501499c88b3c55ea263e95 Mon Sep 17 00:00:00 2001 From: Kevin Manuel Date: Tue, 1 Oct 2024 13:11:23 +0100 Subject: [PATCH 2/2] use a simpler solution of source coupled with echo in a bash subshell --- lib/shared-functions.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/shared-functions.sh b/lib/shared-functions.sh index 7f955312..f1dfafb3 100644 --- a/lib/shared-functions.sh +++ b/lib/shared-functions.sh @@ -179,12 +179,16 @@ function check_sharelatex_env_vars() { function read_variable() { local name=$1 - grep -E "^$name=" "$TOOLKIT_ROOT/config/variables.env" \ - | sed -r "s/^$name=([\"']?)([^\"']+)[\"']?$/\2/" + ( + source "$TOOLKIT_ROOT/config/variables.env" + echo "${!name:-}" + ) } function read_configuration() { local name=$1 - grep -E "^$name=" "$TOOLKIT_ROOT/config/overleaf.rc" \ - | sed -r "s/^$name=([\"']?)([^\"']+)[\"']?$/\2/" + ( + source "$TOOLKIT_ROOT/config/overleaf.rc" + echo "${!name:-}" + ) }