cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #5149

Browse Source 
also fixes clean_map_git.sh (mloooc)
This commit is contained in:
Boop
2014-06-15 21:16:24 +01:00
parent 5ca5e5c170
commit 7a4d0f873d
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/mapmerge/clean_map_git.sh
View File

@@ -1,9 +1,7 @@
#!/bin/sh
MAPFILE='tgstation.2.1.3.dmm'
MAPFILE='tgstation2.dmm'
git show HEAD:_maps/map_files/$MAPFILE > tmp.dmm
java -jar MapPatcher.jar -clean tmp.dmm '../../_maps/map_files/'$MAPFILE '../../_maps/map_files/'$MAPFILE
dos2unix -U '../../_maps/map_files/'$MAPFILE
git show HEAD:maps/$MAPFILE > tmp.dmm
java -jar MapPatcher.jar -clean tmp.dmm '../../maps/'$MAPFILE '../../maps/'$MAPFILE
rm tmp.dmm