From 3c979780f9338b7aee0e480502ac5d5014655fae Mon Sep 17 00:00:00 2001
From: Samuel Vasko <samvasko@gmail.com>
Date: Mon, 9 Dec 2013 00:55:18 +0100
Subject: [PATCH] handles spaces better, also using CMDER_ROOT for everything

---
 bin/alias.bat     |  4 ++--
 config/ConEmu.xml |  2 +-
 vendor/init.bat   | 10 ++++------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/bin/alias.bat b/bin/alias.bat
index 8e048ae..4ec1882 100644
--- a/bin/alias.bat
+++ b/bin/alias.bat
@@ -13,8 +13,8 @@ if not ["%_temp%"] == ["%_temp2%"] (
 	goto:eof
 )
 
-echo %* >> %~dp0..\config\aliases
-doskey /macrofile=%~dp0..\config\aliases
+echo %* >> "%CMDER_ROOT%\config\aliases"
+doskey /macrofile="%CMDER_ROOT%\config\aliases"
 echo Alias created
 endlocal
 goto:eof
diff --git a/config/ConEmu.xml b/config/ConEmu.xml
index 88445b4..87b40c4 100644
--- a/config/ConEmu.xml
+++ b/config/ConEmu.xml
@@ -488,7 +488,7 @@
 						<key name="Task1" modified="2013-11-29 16:19:41" build="131107">
 					<value name="Name" type="string" data="{cmd}"/>
 					<value name="GuiArgs" type="string" data=" /icon &quot;cmd.exe&quot;"/>
-					<value name="Cmd1" type="string" data="cmd /k %CMDER_ROOT%\vendor\init.bat  -new_console:d:%USERPROFILE%"/>
+					<value name="Cmd1" type="string" data="cmd /k &quot;%CMDER_ROOT%\vendor\init.bat&quot;  -new_console:d:%USERPROFILE%"/>
 					<value name="Active" type="dword" data="00000000"/>
 					<value name="Count" type="dword" data="00000001"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
diff --git a/vendor/init.bat b/vendor/init.bat
index dee0a97..6b591d4 100644
--- a/vendor/init.bat
+++ b/vendor/init.bat
@@ -13,10 +13,8 @@
     set architecture=64
 )
 
-@set rootDir="%~dp0\.."
-
 :: Run clink
-@%rootDir%\vendor\clink\clink_x%architecture%.exe inject --quiet --profile %rootDir%\config
+@"%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_ROOT%\config"
 
 :: Prepare for msysgit
 
@@ -25,11 +23,11 @@
 @if not defined TERM set TERM=cygwin
 
 :: Enhance Path
-@set git_install_root=%rootDir%\vendor\msysgit
-@set PATH=%PATH%;%rootDir%\bin;%git_install_root%\bin;%git_install_root%\mingw\bin;%git_install_root%\cmd;%git_install_root%\share\vim\vim73;
+@set git_install_root=%CMDER_ROOT%\vendor\msysgit
+@set PATH=%PATH%;%CMDER_ROOT%\bin;%git_install_root%\bin;%git_install_root%\mingw\bin;%git_install_root%\cmd;%git_install_root%\share\vim\vim73;
 
 :: Add aliases
-@doskey /macrofile="%rootDir%\config\aliases"
+@doskey /macrofile="%CMDER_ROOT%\config\aliases"
 
 :: Set home path
 @set HOME=%USERPROFILE%