Merge branch 'development'

Merge branch '1.1.4.1' into development
Ignore version files.
2025-07-17 04:59:09 +08:00 · 2014-08-31 12:03:13 +01:00 · 2014-08-31 12:01:51 +01:00 · 2014-08-30 16:47:21 +01:00 · 2014-08-30 16:46:22 +01:00 · 2014-08-28 15:02:37 +01:00
8 changed files with 17 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -10,3 +10,4 @@ config/.history
 Thumbs.db
 *.exe
 build/
+Version v*
--- a/config/ConEmu.xml
+++ b/config/ConEmu.xml
@ -488,7 +488,7 @@
 						<key name="Task1" modified="2014-01-21 18:36:36" build="131215">
 					<value name="Name" type="string" data="{cmd}"/>
 					<value name="GuiArgs" type="string" data=" /icon &quot;%CMDER_ROOT%\cmder.exe&quot;"/>
-					<value name="Cmd1" type="string" data="cmd /k &quot;%CMDER_ROOT%\vendor\init.bat&quot;  -new_console:d:%USERPROFILE%"/>
+					<value name="Cmd1" type="string" data="cmd /k &quot;%ConEmuDir%\..\init.bat&quot;  -new_console:d:%HOME%"/>
 					<value name="Active" type="dword" data="00000000"/>
 					<value name="Count" type="dword" data="00000001"/>
 					<value name="Hotkey" type="dword" data="00000000"/>
--- a/msvcp110.dll
+++ b/msvcp110.dll
--- a/msvcp120.dll
+++ b/msvcp120.dll
--- a/msvcr110.dll
+++ b/msvcr110.dll
--- a/msvcr120.dll
+++ b/msvcr120.dll
--- a/scripts/utils.ps1
+++ b/scripts/utils.ps1
@ -1,3 +1,11 @@
+function Ensure-Exists ($path) {
+    if (-not (Test-Path $path)) {
+        Write-Error "Missing required $path! Ensure it is installed"
+        exit 1
+    }
+    return $true > $null
+}
+
 function Ensure-Executable ($command) {
    try { Get-Command $command -ErrorAction Stop > $null }
    catch {
--- a/vendor/init.bat
+++ b/vendor/init.bat
@ -2,6 +2,11 @@
 :: Sets some nice defaults
 :: Created as part of cmder project

+:: Find root dir
+@if not defined CMDER_ROOT (
+    for /f %%i in ("%ConEmuDir%\..\..") do @set CMDER_ROOT=%%~fi
+)
+
 :: Change the prompt style
 :: Mmm tasty lamb
@prompt $E[1;32;40m$P$S{git}$S$_$E[1;30;40m{lamb}$S$E[0m
Author	SHA1	Message	Date
Martin Kemp	bbcabfb730	Merge branch 'development'	2014-08-31 12:03:13 +01:00
Martin Kemp	75801cbdc8	Merge branch '1.1.4.1' into development	2014-08-31 12:01:51 +01:00
Martin Kemp	9822fa844e	Ignore version files. Version files don't need to be tracked.	2014-08-30 16:47:21 +01:00
Martin Kemp	a9f5d552bc	Reintroduce VS2013 dlls. Fixes #246.	2014-08-30 16:46:22 +01:00
Martin Kemp	63120b8998	Merge pull request #243 from narnaud/fix-home Start in the HOME folder.	2014-08-28 15:02:37 +01:00
Martin Kemp	8cdce27653	Merge pull request #249 from narnaud/fix-build Ensure-Exists is necessary for build.ps1, add it back.	2014-08-28 12:59:32 +01:00
Nicolas Arnaud-Cormos	a5691285ec	Ensure-Exists is necessary for build.ps1, add it back.	2014-08-28 13:34:59 +02:00
Nicolas Arnaud-Cormos	3223a0391a	Start in the HOME folder.	2014-08-28 13:09:30 +02:00
Martin Kemp	a39c632d71	Merge pull request #166 from glucas/run_as_admin Find cmder files when running as Administrator.	2014-08-27 09:58:14 +01:00
Greg Lucas	3b053f8848	Remove extraneous quotes. Extra quotes in previous commit caused PATH to be set incorrectly in admin shell.	2014-03-13 12:36:07 -04:00
Greg Lucas	c76950293e	Find cmder files when running as Administrator. When starting a shell as Administrator, the CMDER_ROOT variable is not propagated from the parent (non-Admin) environment. Fix this by using paths relative to %ConEmuDir%. Fixes issue #94.	2014-03-13 11:48:50 -04:00