From 5f6c97d146125e6e2a3b731bbc4e644613f39ecf Mon Sep 17 00:00:00 2001 From: "artnuc.ct9" Date: Thu, 21 Jan 2021 11:57:08 +0400 Subject: [PATCH] dont mess with config file --- Makefile | 7 +++++-- config.xml.dist | 32 +++++++++++--------------------- lang/master/tpl/mail/design.mtt | 4 ++-- 3 files changed, 18 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index db00ea7..ba29c00 100644 --- a/Makefile +++ b/Makefile @@ -6,8 +6,11 @@ ENV?="dev" #To compile project with plugins, add PLUGINS=1 or type `export PLUGINS=1` install: - #copy config file from template - cp config.xml.dist config.xml + #copy config file from template first time only + @if [ ! -f config.xml ]; then \ + cp config.xml.dist config.xml; \ + fi + @if [ $(ENV) = "dev" ]; then \ make install_dev; \ fi diff --git a/config.xml.dist b/config.xml.dist index 1d37fd4..f39c3b8 100644 --- a/config.xml.dist +++ b/config.xml.dist @@ -1,29 +1,19 @@ diff --git a/lang/master/tpl/mail/design.mtt b/lang/master/tpl/mail/design.mtt index 89c41f9..d57c592 100644 --- a/lang/master/tpl/mail/design.mtt +++ b/lang/master/tpl/mail/design.mtt @@ -17,7 +17,7 @@ table.table td{
- ::_("This e-mail was sent from"):: ::_("Cagette.net")::. + ::_("This e-mail was sent from"):: ::group.name::. ::if group!=null::
@@ -37,4 +37,4 @@ table.table td{
::end:: - \ No newline at end of file +