From 9301a0e3197f866848279aa30fa077ce14b5878a Mon Sep 17 00:00:00 2001 From: Aode Date: Sun, 26 Jan 2020 03:17:57 -0600 Subject: [PATCH] Make all fields optional --- murmur/init.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/murmur/init.sh b/murmur/init.sh index 34c86e4..7670ae3 100755 --- a/murmur/init.sh +++ b/murmur/init.sh @@ -16,7 +16,7 @@ function optional() { } function replace() { - sed "s/;$1=.*/$1=$2/g" /etc/murmur.ini > /tmp/murmur.ini + sed "s/;*$1=.*/$1=$2/g" /etc/murmur.ini > /tmp/murmur.ini cat /tmp/murmur.ini > /etc/murmur.ini rm /tmp/murmur.ini } @@ -27,9 +27,9 @@ function optional_replace() { fi } -require "$REGISTER_NAME" "REGISTER_NAME" -require "$REGISTER_URL" "REGISTER_URL" - +optional "$WELCOME_TEXT" "WELCOME_TEXT" +optional "$REGISTER_NAME" "REGISTER_NAME" +optional "$REGISTER_URL" "REGISTER_URL" optional "$HOST" "HOST" optional "$SERVER_PASSWORD" "SERVER_PASSWORD" optional "$REGISTER_PASSWORD" "REGISTER_PASSWORD" @@ -38,9 +38,9 @@ optional "$CERT_REQUIRED" "CERT_REQUIRED" optional "$SSL_CERT_PATH" "SSL_CERT_PATH" optional "$SSL_KEY_PATH" "SSL_KEY_PATH" -replace "registerName" "$REGISTER_NAME" -replace "registerUrl" "$REGISTER_URL" - +optional_replace "welcometext" "$WELCOME_TEXT" +optional_replace "registerName" "$REGISTER_NAME" +optional_replace "registerUrl" "$REGISTER_URL" optional_replace "host" "$HOST" optional_replace "serverpassword" "$SERVER_PASSWORD" optional_replace "registerPassword" "$REGISTER_PASSWORD"