up version to 0.10.0.2, fixes for Mac and Linux servers

patches/tModLoader/Terraria.ModLoader/ModLoader.cs

@@ -26,7 +26,7 @@ public static class ModLoader
 	{
 		//change Terraria.Main.DrawMenu change drawn version number string to include this
 		/// <summary>The name and version number of tModLoader.</summary>
-		public static readonly Version version = new Version(0, 10, 0, 1);
+		public static readonly Version version = new Version(0, 10, 0, 2);
 		public static readonly string versionedName = "tModLoader v" + version;
 #if WINDOWS
 		public static readonly bool windows = true;

solutions/CompleteRelease.bat

@@ -1,7 +1,7 @@
 :: After Pulling, Patching, and making sure the version number is changed in src, this bat will compile and create zips for all release.
 :: It will also create a zip for ExampleMod
 
-set version=v0.10.0.1
+set version=v0.10.0.2
 set destinationFolder=.\tModLoader %version% Release
 
 :: Compile/Build exe 
@@ -51,7 +51,7 @@ call zipjs.bat zipDirItems -source "%destinationFolder%\tModLoader Windows %vers
 :: Mac release
 copy ..\src\tModLoader\bin\x86\MacRelease\Terraria.exe "%destinationFolder%\tModLoader Mac %version%\Terraria.exe" /y
 copy ..\src\tModLoader\bin\x86\MacServerRelease\Terraria.exe "%destinationFolder%\tModLoader Mac %version%\tModLoaderServer.exe" /y
-copy ReleaseExtras\tModLoaderServer "%destinationFolder%\tModLoader Mac %version%\tModLoaderServer" /y
+copy ReleaseExtras\tModLoaderServer_Mac "%destinationFolder%\tModLoader Mac %version%\tModLoaderServer" /y
 copy ReleaseExtras\tModLoaderServer.bin.osx "%destinationFolder%\tModLoader Mac %version%\tModLoaderServer.bin.osx" /y
 :: ModCompile
 copy ..\src\tModLoader\bin\x86\WindowsRelease\Terraria.exe "%destinationFolder%\tModLoader Mac %version%\ModCompile\tModLoaderWindows.exe" /y
@@ -75,7 +75,7 @@ call zipjs.bat zipDirItems -source "%destinationFolder%\tModLoader Mac %version%
 :: Linux release
 copy ..\src\tModLoader\bin\x86\LinuxRelease\Terraria.exe "%destinationFolder%\tModLoader Linux %version%\Terraria.exe" /y
 copy ..\src\tModLoader\bin\x86\LinuxServerRelease\Terraria.exe "%destinationFolder%\tModLoader Linux %version%\tModLoaderServer.exe" /y
-copy ReleaseExtras\tModLoaderServer "%destinationFolder%\tModLoader Linux %version%\tModLoaderServer" /y
+copy ReleaseExtras\tModLoaderServer_Linux "%destinationFolder%\tModLoader Linux %version%\tModLoaderServer" /y
 copy ReleaseExtras\tModLoaderServer.bin.x86 "%destinationFolder%\tModLoader Linux %version%\tModLoaderServer.bin.x86" /y
 copy ReleaseExtras\tModLoaderServer.bin.x86_64 "%destinationFolder%\tModLoader Linux %version%\tModLoaderServer.bin.x86_64" /y
 :: ModCompile

solutions/ReleaseExtras/tModLoaderServer → solutions/ReleaseExtras/tModLoaderServer_Linux

@@ -8,16 +8,37 @@ cd "`dirname "$0"`"
 # Get the system architecture
 UNAME=`uname`
 ARCH=`uname -m`
+BASENAME=`basename "$0"`
 
 # MonoKickstart picks the right libfolder, so just execute the right binary.
 if [ "$UNAME" == "Darwin" ]; then
-	# ... Except on OSX.
-	export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:./osx/
-	./tModLoaderServer.bin.osx $@
+	ext=osx
 else
+	ext=x86
 	if [ "$ARCH" == "x86_64" ]; then
-		./tModLoaderServer.bin.x86_64 $@
+		ext=x86_64
 	else
-		./tModLoaderServer.bin.x86 $@
+		ext=x86
 	fi
+	for arg in "$@"
+	do
+		case "$arg" in
+		-x86)	ext=x86
+			;;
+		-x64)	ext=x86_64
+			;;
+		-autoarch)
+			if [ "$ARCH" == "x86_64" ]; then
+				ext=x86_64
+			else
+				ext=x86
+			fi
+			;;
+		esac
+	done
 fi
+
+
+export MONO_IOMAP=all
+./${BASENAME}.bin.${ext} $@
+

solutions/ReleaseExtras/tModLoaderServer_Mac

@@ -0,0 +1,18 @@
+#!/bin/bash
+# MonoKickstart Shell Script
+# Written by Ethan "flibitijibibo" Lee
+
+cd "`dirname "$0"`"
+
+UNAME=`uname`
+ARCH=`uname -m`
+
+if [ "$UNAME" == "Darwin" ]; then
+	export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:./osx/
+
+	if [ "$STEAM_DYLD_INSERT_LIBRARIES" != "" ] && [ "$DYLD_INSERT_LIBRARIES" == "" ]; then
+		export DYLD_INSERT_LIBRARIES="$STEAM_DYLD_INSERT_LIBRARIES"
+	fi
+
+	./TerrariaServer.bin.osx $@
+fi