From d2878faa3319b56a518ad5754ae8b1ff89a8ce84 Mon Sep 17 00:00:00 2001
From: Eloraam <jen@elaan.com>
Date: Thu, 25 Aug 2011 17:15:02 +0000
Subject: [PATCH] Patched the installer again.

---
 forge/install/install.cmd | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/forge/install/install.cmd b/forge/install/install.cmd
index 00dd872ab..df6806d60 100755
--- a/forge/install/install.cmd
+++ b/forge/install/install.cmd
@@ -1,10 +1,10 @@
 @echo off
-echo Minecraft Forge Install and Build Script v1.2
+echo Minecraft Forge Install and Build Script v1.3
 echo -Searching for components...
 set MCP=ERROR!
 set HOME=ERROR!
 if /i exist "%~dp0\%~nx0" (set MCP="%~dp0.."&& set HOME="%~dp0")
-if /i exist "%~dp0..\install\%~nx0" (set MCP="%~dp0..\.."&& set HOME="%~dp0..")
+if /i exist "%~dp0\install\%~nx0" (set MCP="%~dp0..\.."&& set HOME="%~dp0..")
 if /i exist "%~dp0\forge\%~nx0" (set MCP="%~dp0" && set HOME="%~dp0\forge")
 if %MCP%==ERROR! (echo -Error: Forge Not Detected! && echo -Please be sure you've installed it properly.)
 if %HOME%==ERROR! (echo -Error: MCP Not Detected! && echo -Please be sure you've installed it - and Forge - properly.)
@@ -18,9 +18,9 @@ set HOME=%HOME:'=%
 if /i not exist "%MCP%\src\minecraft\net\minecraft\client\minecraft.java" (echo -Decompiled source not detected, decompiling minecraft.jar... && pushd %MCP% && echo -NEW SESSION >> compile.log && cmd /c "runtime\bin\python\python_mcp runtime\decompile.py %*" && popd) else (echo -Decompiled source detected)
 pushd %MCP%\src
 echo -Applying forge to the sourcetree...
-xcopy /Y /E /G /Q "%HOME%"\forge_client\src\net\* "%MCP%"\src\minecraft\net
-xcopy /Y /E /G /Q "%HOME%"\forge_common\net\* "%MCP%"\src\minecraft\net
-echo D | xcopy /Y /E /G /Q "%HOME%\forge_common\net\*" "%MCP%"\src\minecraft_server\net
+xcopy /Y /E /G /Q "%HOME%\forge_client\src\net\*" "%MCP%\src\minecraft\net"
+xcopy /Y /E /G /Q "%HOME%\forge_common\net\*" "%MCP%\src\minecraft\net"
+echo D | xcopy /Y /E /G /Q "%HOME%\forge_common\net\*" "%MCP%\src\minecraft_server\net"
 echo -NEW SESSION >> forgepatch.log
 "%MCP%\runtime\bin\python\python_mcp" "%HOME%\lfcr.py" "%HOME%\minecraft.patch" "%HOME%\minecraft-win.patch" >> forgepatch.log
 echo -Patching necessary source files for forge... 
@@ -30,5 +30,3 @@ echo -Forge ready for use, recompiling...
 pushd %MCP%
 cmd /c "runtime\bin\python\python_mcp runtime\recompile.py %*"
 popd
-echo -Recompilation complete!
-echo.