Remove some client-related stuff from our herculeswrapper copy

1 files changed, 31 insertions, 31 deletions

diff --git a/herculeswrapper/include.sh b/herculeswrapper/include.sh
index 02e0bc7..1c8990c 100644
--- a/herculeswrapper/include.sh
+++ b/herculeswrapper/include.sh
@@ -54,10 +54,10 @@ function hard_reset {
 
 function pull_all {
     hard_reset "data"
-    cd ../client-data
-    hard_reset "client"
-    cd ../music
-    hard_reset "music"
+    #cd ../client-data
+    #hard_reset "client"
+    #cd ../music
+    #hard_reset "music"
     cd ../server-code
     hard_reset "code"
     cd src/evol
@@ -228,39 +228,39 @@ function git_merge {
             try_merge $branch
         done
 
-        run cd $client_data
+        #run cd $client_data
 
         # force new master and back up for future restoration
-        run git fetch --all
-        run git reset --hard $client_main_branch
-
-        info 'commit=$(' git rev-parse --verify -q $client_main_branch ')'
-        commit=$(git rev-parse --verify -q $client_main_branch)
-        info2 client base $client_main_branch $commit >> $motd
-        for branch in ${client_extra_branches[@]}
-        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
+        #run git fetch --all
+        #run git reset --hard $client_main_branch
+
+        #info 'commit=$(' git rev-parse --verify -q $client_main_branch ')'
+        #commit=$(git rev-parse --verify -q $client_main_branch)
+        #info2 client base $client_main_branch $commit >> $motd
+        #for branch in ${client_extra_branches[@]}
+        #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
 
         # generate the transient updates
-        run cd $tmw_tools/update/
-        run ./createnew.sh
-        run ./create_music.sh
-        run cd ../../server-data/
+        #run cd $tmw_tools/update/
+        #run ./createnew.sh
+        #run ./create_music.sh
+        #run cd ../../server-data/
     fi
 }