diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-10-13 20:15:24 +0000 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-10-13 20:15:24 +0000 |
commit | 994250e7619a0a18a61d65c9a132fcf71abce2f2 (patch) | |
tree | 7d13ba35d7f813acccdd5b8722e1cddf707f2ada | |
parent | e79d9ad0618ea914ecb76f588e8281319f8c385b (diff) | |
parent | c1e8d6907938980fd860cd92f94fa5d32c4c0eca (diff) | |
download | evol-tools-994250e7619a0a18a61d65c9a132fcf71abce2f2.tar.gz evol-tools-994250e7619a0a18a61d65c9a132fcf71abce2f2.tar.bz2 evol-tools-994250e7619a0a18a61d65c9a132fcf71abce2f2.tar.xz evol-tools-994250e7619a0a18a61d65c9a132fcf71abce2f2.zip |
Merge branch 'motd-in-config' into 'master'
Add MOTD to configs
See merge request !8
-rwxr-xr-x | localserver/installconfigs.sh | 4 | ||||
-rw-r--r-- | localserver/npc/motd-debug-text.txt | 4 | ||||
-rw-r--r-- | localserver/npc/motd-text.txt | 4 | ||||
-rwxr-xr-x | localserver/updateconfigs.sh | 5 |
4 files changed, 16 insertions, 1 deletions
diff --git a/localserver/installconfigs.sh b/localserver/installconfigs.sh index 3f403a4..5d68a03 100755 --- a/localserver/installconfigs.sh +++ b/localserver/installconfigs.sh @@ -2,10 +2,12 @@ export SD="../../server-data" export CONF="$SD/conf/import" +export NPC="$SD/npc" mkdir $CONF cp conf/* $CONF cp -f conf/inter_conf.txt $CONF cp -f ${SD}/conf/channels.conf.base ${SD}/conf/channels.conf +cp -f npc/motd-* ${NPC}/commands/ mkdir versions -echo "3" >versions/confver +echo "4" >versions/confver diff --git a/localserver/npc/motd-debug-text.txt b/localserver/npc/motd-debug-text.txt new file mode 100644 index 0000000..1dc8621 --- /dev/null +++ b/localserver/npc/motd-debug-text.txt @@ -0,0 +1,4 @@ +function script MOTD_debug_text { + setarray $Debug_Messages$,""; + return; +} diff --git a/localserver/npc/motd-text.txt b/localserver/npc/motd-text.txt new file mode 100644 index 0000000..093616e --- /dev/null +++ b/localserver/npc/motd-text.txt @@ -0,0 +1,4 @@ +function script MOTD_text { + setarray $MOTD_Messages$,""; + return; +} diff --git a/localserver/updateconfigs.sh b/localserver/updateconfigs.sh index 699c670..2e85481 100755 --- a/localserver/updateconfigs.sh +++ b/localserver/updateconfigs.sh @@ -23,3 +23,8 @@ if [ "${VER}" -lt "3" ]; then cp conf/constants.conf ${CONFDIR}/conf/import/ echo "3" >versions/confver fi + +if [ "${VER}" -lt "4" ]; then + cp -f npc/motd-* ${CONFDIR}/npc/commands/ + echo "4" >versions/confver +fi |