diff options
Diffstat (limited to 'herculeswrapper/include.sh')
| -rw-r--r-- | herculeswrapper/include.sh | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/herculeswrapper/include.sh b/herculeswrapper/include.sh index 9aa891c..4ee3750 100644 --- a/herculeswrapper/include.sh +++ b/herculeswrapper/include.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function create_pipe { trap "rm -f $PIPE" EXIT @@ -83,6 +83,7 @@ function pull_all { cd ../ ./status.sh cd server-data + make maps } function build_all { @@ -228,7 +229,7 @@ function git_merge { source ../tools/herculeswrapper/herc-map-wrapper-config run test -f $motd - echo -e 'function\tscript\tMOTD_debug_text\t{\n setarray $Debug_Messages$,' > $motd + echo -e 'function\tscript\tMOTD_debug_text\t{\n setarray $@Debug_Messages$[0],' > $motd run git fetch --all run git reset --hard $server_main_branch info 'commit=$(' git rev-parse --verify -q $server_main_branch ')' @@ -252,6 +253,19 @@ function git_merge { do try_merge $branch done + + run cd $evol_music + + run git fetch --all + run git reset --hard $music_main_branch + info 'commit=$(' git rev-parse --verify -q $music_main_branch ')' + commit=$(git rev-parse --verify -q $music_main_branch) + info2 music base $music_main_branch $commit >> $motd + for branch in ${music_extra_branches[@]} + do + try_merge $branch + done + echo '"End of Commits";' >> $motd echo -e ' return;\n}' >> $motd |