5 files changed, 26 insertions, 5 deletions
diff --git a/herculeswrapper/char.sh b/herculeswrapper/char.sh
index cdca266..2b794d9 100755
--- a/herculeswrapper/char.sh
+++ b/herculeswrapper/char.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 export PIPE=./log/charpipe.tmp
 
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 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
 
diff --git a/herculeswrapper/login.sh b/herculeswrapper/login.sh
index ae67bf8..32085dd 100755
--- a/herculeswrapper/login.sh
+++ b/herculeswrapper/login.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 export PIPE=./log/loginpipe.tmp
 
diff --git a/herculeswrapper/map.sh b/herculeswrapper/map.sh
index 18994e2..055acd7 100755
--- a/herculeswrapper/map.sh
+++ b/herculeswrapper/map.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 export PIPE=./log/mappipe.tmp
 export LOGIN_PIPE=./log/loginpipe.tmp