From 6aa490e8bd175347b78bb180b3dfbc885c77e4d0 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Wed, 1 Dec 2021 22:03:23 +0100 Subject: [PATCH] improve parse_yaml --- paperless_ng/rootfs/etc/cont-init.d/90-config_yaml.sh | 2 +- webtrees/rootfs/scripts/90-config_yaml.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/paperless_ng/rootfs/etc/cont-init.d/90-config_yaml.sh b/paperless_ng/rootfs/etc/cont-init.d/90-config_yaml.sh index a3e2b4ec9..42f3b3626 100644 --- a/paperless_ng/rootfs/etc/cont-init.d/90-config_yaml.sh +++ b/paperless_ng/rootfs/etc/cont-init.d/90-config_yaml.sh @@ -43,7 +43,7 @@ fi # Helper function function parse_yaml { local prefix=$2 || local prefix="" - local s='[[:space:]]*' w='[a-zA-Z0-9_]*' fs=$(echo @ | tr @ '\034') + local s='[[:space:]]*' w='[a-zA-Z0-9_]*' fs=$(echo @ | tr @ '\034' | tr -d '\015') sed -ne "s|^\($s\):|\1|" \ -e "s| #.*$||g" \ -e "s|#.*$||g" \ diff --git a/webtrees/rootfs/scripts/90-config_yaml.sh b/webtrees/rootfs/scripts/90-config_yaml.sh index a3e2b4ec9..42f3b3626 100644 --- a/webtrees/rootfs/scripts/90-config_yaml.sh +++ b/webtrees/rootfs/scripts/90-config_yaml.sh @@ -43,7 +43,7 @@ fi # Helper function function parse_yaml { local prefix=$2 || local prefix="" - local s='[[:space:]]*' w='[a-zA-Z0-9_]*' fs=$(echo @ | tr @ '\034') + local s='[[:space:]]*' w='[a-zA-Z0-9_]*' fs=$(echo @ | tr @ '\034' | tr -d '\015') sed -ne "s|^\($s\):|\1|" \ -e "s| #.*$||g" \ -e "s|#.*$||g" \