From cd73cbacc0ebbb618972acd968bd4ceb6cb84d28 Mon Sep 17 00:00:00 2001 From: rory Date: Fri, 9 Dec 2022 17:21:53 -0800 Subject: [PATCH 1/2] Fix set-pusher-suffix after linter --- scripts/set-pusher-suffix.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/set-pusher-suffix.sh b/scripts/set-pusher-suffix.sh index e1620b149f7b..2f6f3efab5ca 100755 --- a/scripts/set-pusher-suffix.sh +++ b/scripts/set-pusher-suffix.sh @@ -4,9 +4,13 @@ # config file to be parsed for the suffix (relative to current project root) CONFIG_FILE="../Web-Expensify/_config.local.php" -if [ -f ".env" ]; then - # Export vars from the .env file to access the $EXPENSIFY_URL - export "$(grep -v '^#' .env | xargs)" +if [ -f '.env' ]; then + while read -r line; do + if [[ "$line" == \#* ]]; then + continue + fi + export "${line?}" + done < .env fi # use the suffix only when the config file can be found From 0e3c449e67a0d9d3b14ed2793a9b000279b577ac Mon Sep 17 00:00:00 2001 From: rory Date: Fri, 9 Dec 2022 17:23:46 -0800 Subject: [PATCH 2/2] Use 4 spaces --- scripts/set-pusher-suffix.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/set-pusher-suffix.sh b/scripts/set-pusher-suffix.sh index 2f6f3efab5ca..eaa51f1425c0 100755 --- a/scripts/set-pusher-suffix.sh +++ b/scripts/set-pusher-suffix.sh @@ -5,12 +5,12 @@ CONFIG_FILE="../Web-Expensify/_config.local.php" if [ -f '.env' ]; then - while read -r line; do - if [[ "$line" == \#* ]]; then - continue - fi - export "${line?}" - done < .env + while read -r line; do + if [[ "$line" == \#* ]]; then + continue + fi + export "${line?}" + done < .env fi # use the suffix only when the config file can be found