mirrors/overleaf-toolkit
1
0
Fork 0
mirror of https://github.com/overleaf/toolkit.git synced 2025-04-19 15:28:06 +02:00
Code Activity

Move set +o pipefail into subshell commands

Browse source
This commit is contained in:
mserranom 2024-02-16 13:51:43 +01:00 • committed by Jakob Ackermann
parent 026bdb7bf0
commit ed49e87b39
No known key found for this signature in database
GPG key ID: 30C56800FCA3828A
2 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
bin/docker-compose
View file

@ -19,9 +19,7 @@ fi
source "$TOOLKIT_ROOT/lib/shared-functions.sh"
function check_sharelatex_env_vars() {
set +o pipefail
local rc_occurrences=$(grep -o SHARELATEX_ "$TOOLKIT_ROOT/config/overleaf.rc" | wc -l | sed 's/ //g')
set -o pipefail
local rc_occurrences=$(set +o pipefail && grep -o SHARELATEX_ "$TOOLKIT_ROOT/config/overleaf.rc" | wc -l | sed 's/ //g')
if [ "$rc_occurrences" -gt 0 ]; then
echo "WARNING: some runtime variables defined in config/overleaf.rc"
@ -36,9 +34,7 @@ function check_sharelatex_env_vars() {
invalid_prefix="OVERLEAF_"
fi
set +o pipefail
local env_occurrences=$(grep -o "$invalid_prefix" "$TOOLKIT_ROOT/config/variables.env" | wc -l | sed 's/ //g')
set -o pipefail
local env_occurrences=$(set +o pipefail && grep -o "$invalid_prefix" "$TOOLKIT_ROOT/config/variables.env" | wc -l | sed 's/ //g')
if [ "$env_occurrences" -gt 0 ]; then
echo "WARNING: some environment variables defined in config/variables.env"

4
lib/shared-functions.sh
View file

@ -28,9 +28,7 @@ prompt() {
rebrand_sharelatex_env_variables() {
local filename=$1
set +o pipefail
sharelatex_occurrences=$(grep -o "SHARELATEX_" "$TOOLKIT_ROOT/config/$filename" | wc -l | sed 's/ //g')
set -o pipefail
sharelatex_occurrences=$(set +o pipefail && grep -o "SHARELATEX_" "$TOOLKIT_ROOT/config/$filename" | wc -l | sed 's/ //g')
if [ "$sharelatex_occurrences" -gt 0 ]; then
echo "Found $sharelatex_occurrences lines with SHARELATEX_ in $filename"
local timestamp=$(date "+%Y.%m.%d-%H.%M.%S")