From cc89c6d299c7133570526669c7e93bee83d4d064 Mon Sep 17 00:00:00 2001 From: danilapog Date: Mon, 11 Jul 2022 17:18:06 +0300 Subject: [PATCH] Fix ^M after sed --- run-document-server.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/run-document-server.sh b/run-document-server.sh index 614d6b6..002ebf3 100755 --- a/run-document-server.sh +++ b/run-document-server.sh @@ -173,7 +173,8 @@ update_supervisor_config() { if [[ -z ${RESULT} ]]; then for file in ${SUPERVISOR_CONF_DIR}/ds-converter.conf ${SUPERVISOR_CONF_DIR}/ds-docservice.conf do - sed -i "s|environment.*|&\,NODE_OPTIONS=${NODE_OPTIONS}|g" $file + sed -i -e "s|environment.*|&\,NODE_OPTIONS=${NODE_OPTIONS}|g" $file &> /dev/null + sed -i 's/\r//g' $file &> /dev/null done fi fi @@ -483,7 +484,7 @@ update_nginx_settings(){ sed 's/linux/docker/' -i ${NGINX_ONLYOFFICE_EXAMPLE_CONF} fi - documentserver-update-securelink.sh -s ${SECURE_LINK_SECRET:-$(pwgen -s 20)} + documentserver-update-securelink.sh -s ${SECURE_LINK_SECRET:-$(pwgen -s 20)} false } update_supervisor_settings(){