diff options
| -rw-r--r-- | herculeswrapper/herc-map-wrapper-config.example | 7 | ||||
| -rw-r--r-- | herculeswrapper/include.sh | 13 |
2 files changed, 20 insertions, 0 deletions
diff --git a/herculeswrapper/herc-map-wrapper-config.example b/herculeswrapper/herc-map-wrapper-config.example index 233d072..b3afd8d 100644 --- a/herculeswrapper/herc-map-wrapper-config.example +++ b/herculeswrapper/herc-map-wrapper-config.example @@ -12,6 +12,7 @@ exit 1 server_data=../../server-data client_data=../client-data +evol_music=../music tmw_tools=../tools #gitlab @@ -59,6 +60,12 @@ client_main_branch=origin/master client_extra_branches=( $(list_issues <repo id> | sed 's|^|origin/merge-requests/|;') ) + +music_main_branch=origin/master + +music_extra_branches=( + $(list_issues <repo id> | sed 's|^|origin/merge-requests/|;') +) unset list_issues motd=../server-data/npc/commands/motd-debug-text.txt diff --git a/herculeswrapper/include.sh b/herculeswrapper/include.sh index d251f9b..aecb988 100644 --- a/herculeswrapper/include.sh +++ b/herculeswrapper/include.sh @@ -253,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 |