Merge branch 'development'

Version files don't need to be tracked.

.gitignore

@@ -4,6 +4,10 @@
 vendor/*
 !vendor/*.md
 !vendor/*.bat
+!vendor/*.json
+
 config/.history
 Thumbs.db
 *.exe
+build/
+Version v*

Readme.md

@@ -1,8 +1,8 @@
 # Cmder
 
-Latest release is **[v1.1.3](https://github.com/bliker/cmder/releases/tag/v1.1.3)**
+Latest release is **[v1.1.4](https://github.com/bliker/cmder/releases/tag/v1.1.4)**
 
-Cmder is a **software package** created out of pure frustration over absence of usable console emulator on Windows. It is based on [ConEmu](https://code.google.com/p/conemu-maximus5/) with *major* config overhaul. Monokai color scheme, amazing [clink](https://code.google.com/p/clink/) and custom prompt layout.
+Cmder is a **software package** created out of pure frustration over absence of usable console emulator on Windows. It is based on [ConEmu](https://code.google.com/p/conemu-maximus5/) with *major* config overhaul. Monokai color scheme, amazing [clink](https://github.com/mridgers/clink) and custom prompt layout.
 
 ![Cmder Screenshot](http://i.imgur.com/g1nNf0I.png)
 
@@ -19,6 +19,20 @@ The main advantage of Cmder is portability. It is designed to be totally self-co
 
 *(There will be a version with installer)*
 
+## Integration
+
+So you've experimented with cmder a little and want to give it a shot in a more permanent home;
+
+### Shortcut to open Cmder in a chosen folder
+
+1. Open a terminal as an Administrator
+1. Navigate to the directory you have placed Cmder
+1. Execute `.\cmder.exe /REGISTER ALL`*
+
+In a file explorer window right click in or on a directory to see "Cmder Here" in the context menu.
+
+*If you get a message "Access Denied" ensure you are executing the command in an Administrator prompt.
+
 ## Keyboard shortcuts
 
 ### Tab manipulation
@@ -52,7 +66,8 @@ All aliases will be saved in `/config/aliases` file
 1. Complete PowerShell compatibility.
 2. Workaround git.exe overload after msysgit download (Granted this is an upstream issue).
 3. Redo Build/Pack scripts or remove them altogether.
-4. Launcher XP compatibility.
+4. Git Bash
+5. Check for clink and git before injecting them
 
 ## License
 

build.rb

@@ -1,125 +0,0 @@
-# Samuel Vasko 2013
-# Cmder build script
-# Like really a beta
-#
-# This script downloads dependencies form google code. Each software is extracted
-# in a folder with same name as the project on google code. So Conemu becomes
-# conemu-maximus5. Correct files are beeing picked by using labels.
-# I will move the script for getting files by labels from php to here as soon I feel like it
-
-require 'fileutils'
-require 'open-uri'
-require 'uri'
-
-def get_file project, query
-    urlToFile = URI.escape('http://samuelvasko.tk/gcode/?project='+project+'&query='+query)
-    open(urlToFile) do |resp|
-        urlToFile = URI.escape(resp.read.split(/\r?\n/).first)
-    end
-
-    extension = urlToFile.split('.').last
-    filename = project+'.'+extension
-
-    puts "\n ------ Downloading #{project} from #{urlToFile} ------- \n \n"
-    begin
-        open(urlToFile, 'rb') do |infile|
-            open(filename, 'wb') do |outfile|
-                outfile.write(infile.read)
-            end
-        end
-    rescue IOError => error
-        puts error
-        FileUtils.rm(filename) if File.exists?(filename)
-        exit(1)
-    end
-
-    system("7z x -o\"#{project}\" #{filename}")
-
-    File.unlink(project+"."+extension);
-
-    # When the folder contains another folder
-    # that is not what we want
-    if Dir.glob("#{project}/*").length == 1
-        temp_name = "#{project}_temp"
-        FileUtils.mv(project, temp_name)
-        FileUtils.mv(Dir.glob("#{temp_name}/*")[0], project)
-        FileUtils.rm_r(temp_name)
-    end
-end
-
-def find_on_path exe
-    path = ENV['PATH'].split(File::PATH_SEPARATOR)
-    for dir in path
-        if File.exists?(File.join(dir, exe))
-            return true
-        end
-    end
-
-    return false
-end
-
-puts '
-______       _ _     _ _                                   _
-| ___ \     (_) |   | (_)                                 | |
-| |_/ /_   _ _| | __| |_ _ __   __ _     ___ _ __ ___   __| | ___ _ __
-| ___ \ | | | | |/ _` | | \'_ \ / _` |   / __| \'_ ` _ \ / _` |/ _ \ \'__|
-| |_/ / |_| | | | (_| | | | | | (_| |  | (__| | | | | | (_| |  __/ |
-\____/ \__,_|_|_|\__,_|_|_| |_|\__, |   \___|_| |_| |_|\__,_|\___|_|
-                                __/ |
-                               |___/
-'
-
-unless find_on_path('7z.exe')
-    puts '7z.exe not found. Ensure 7-zip is installed and on the PATH.'
-    exit(1)
-end
-
-build_exe = true
-unless find_on_path('msbuild.exe')
-    puts 'msbuild.exe not found. We need that to build the executable.'
-    puts 'Do you want to continue? [Y/n]'
-    build_exe = false
-    exit(1) unless gets.chomp.downcase == 'y'
-end
-
-puts 'Cleanup'
-
-if Dir.exists?('vendor')
-    Dir.glob('vendor/*') { |file| FileUtils.rm_rf(file) if File.directory?(file) }
-end
-
-Dir.chdir('vendor')
-
-puts 'Getting files'
-
-get_file('clink', 'label:Type-Archive label:Featured')
-get_file('conemu-maximus5', 'label:Type-Archive label:Preview label:Featured')
-get_file('msysgit', 'label:Type-Archive label:Featured')
-
-puts 'Creating executable'
-
-puts 'Build for XP? (Default: No)'
-if gets.downcase =='yes' or 'y'
-    XP = true
-elsif gets.downcase == 'no' or 'n'
-    XP = false
-else
-    puts 'Defaulting to non-XP build'
-    XP = false
-end
-
-if build_exe
-    Dir.chdir('../launcher')
-    if XP
-        puts 'Building XP Compatible Launcher...'
-        status = system('msbuild /p:Configuration=ReleaseXP')
-    else
-        status = system('msbuild /p:Configuration=Release')
-    end
-    unless status
-        puts 'Looks like the build failed'
-        exit(1)
-    end
-end
-
-puts 'Done, bye'

config/ConEmu.xml

@@ -349,7 +349,7 @@
 			<value name="SwitchGuiFocus" type="dword" data="00000000"/>
 			<value name="SetFocusGui" type="dword" data="00000000"/>
 			<value name="SetFocusChild" type="dword" data="00000000"/>
-			<value name="ChildSystemMenu" type="dword" data="00000000"/>
+			<value name="ChildSystemMenu" type="dword" data="006b2d288000000"/>
 			<value name="Multi.NewConsole" type="dword" data="80808000"/>
 			<value name="Multi.NewConsoleShift" type="dword" data="00001154"/>
 			<value name="Multi.NewConsolePopup" type="dword" data="80808000"/>
@@ -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"/>
@@ -505,8 +505,8 @@
 				<key name="Apps" modified="2014-01-21 18:36:36" build="131215">
 				<value name="Count" type="dword" data="00000000"/>
 			</key>
-				<key name="Colors" modified="2014-01-31 17:13:53" build="131107">
+			<key name="Colors" modified="2014-01-21 18:36:36" build="131215">
-			<key name="Palette1" modified="2014-01-31 17:13:53" build="131107">
+			<key name="Palette1" modified="2014-01-21 18:36:36" build="131215">
 					<value name="Name" type="string" data="Monokai"/>
 					<value name="ExtendColors" type="hex" data="00"/>
 					<value name="ExtendColorIdx" type="hex" data="0e"/>

launcher/CmderLauncher.sln

@@ -8,19 +8,13 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
-		DebugXP|Win32 = DebugXP|Win32
 		Release|Win32 = Release|Win32
-		ReleaseXP|Win32 = ReleaseXP|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Debug|Win32.Build.0 = Debug|Win32
-		{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.DebugXP|Win32.ActiveCfg = DebugXP|Win32
-		{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.DebugXP|Win32.Build.0 = DebugXP|Win32
 		{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Release|Win32.ActiveCfg = Release|Win32
 		{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Release|Win32.Build.0 = Release|Win32
-		{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32
-		{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.ReleaseXP|Win32.Build.0 = ReleaseXP|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

launcher/CmderLauncher.vcxproj

@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugXP|Win32">
-      <Configuration>DebugXP</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseXP|Win32">
-      <Configuration>ReleaseXP</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -30,12 +22,6 @@
     <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120_xp</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -43,45 +29,24 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120_xp</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <TargetName>Cmder</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <TargetName>Cmder</TargetName>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <TargetName>Cmder</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>Cmder</TargetName>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>
@@ -96,20 +61,6 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;XP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -132,28 +83,6 @@
       <Command>copy $(TargetPath) $(SolutionDir)..\$(TargetFileName)</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MinSpace</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;XP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy $(TargetPath) $(SolutionDir)..\$(TargetFileName)</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
   <ItemGroup>
     <ResourceCompile Include="src\Resource.rc" />
   </ItemGroup>

launcher/src/CmderLauncher.cpp

@@ -12,8 +12,11 @@
 
 #define USE_TASKBAR_API (_WIN32_WINNT >= _WIN32_WINNT_WIN7)
 
+#define XP (_WIN32_WINNT < _WIN32_WINNT_VISTA)
+
 #define MB_TITLE L"Cmder Launcher"
-#define SHELL_MENU_REGISTRY_PATH L"Directory\\Background\\shell\\Cmder"
+#define SHELL_MENU_REGISTRY_PATH_BACKGROUND L"Directory\\Background\\shell\\Cmder"
+#define SHELL_MENU_REGISTRY_PATH_LISTITEM L"Directory\\shell\\Cmder"
 
 #define streqi(a, b) (_wcsicmp((a), (b)) == 0) 
 
@@ -154,30 +157,42 @@ HKEY GetRootKey(std::wstring opt)
 	return root;
 }
 
-void RegisterShellMenu(std::wstring opt)
+void RegisterShellMenu(std::wstring opt, wchar_t* keyBaseName)
 {
-	HKEY root = GetRootKey(opt);
+	// First, get the paths we will use
-
-	HKEY cmderKey;
-	FAIL_ON_ERROR(
-		RegCreateKeyEx(root, SHELL_MENU_REGISTRY_PATH, 0, NULL,
-		REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &cmderKey, NULL));
-
-	FAIL_ON_ERROR(RegSetValue(cmderKey, L"", REG_SZ, L"Cmder Here", NULL));
-	FAIL_ON_ERROR(RegSetValueEx(cmderKey, L"NoWorkingDirectory", 0, REG_SZ, (BYTE *)L"", 2));
-
-	HKEY command;
-	FAIL_ON_ERROR(
-		RegCreateKeyEx(cmderKey, L"command", 0, NULL,
-		REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &command, NULL));
 
 	wchar_t exePath[MAX_PATH] = { 0 };
+	wchar_t icoPath[MAX_PATH] = { 0 };
 
 	GetModuleFileName(NULL, exePath, sizeof(exePath));
 
 	wchar_t commandStr[MAX_PATH + 20] = { 0 };
 	swprintf_s(commandStr, L"\"%s\" \"%%V\"", exePath);
 
+	// Now that we have `commandStr`, it's OK to change `exePath`...
+	PathRemoveFileSpec(exePath);
+
+	PathCombine(icoPath, exePath, L"icons\\cmder.ico");
+
+	// Now set the registry keys
+
+	HKEY root = GetRootKey(opt);
+
+	HKEY cmderKey;
+	FAIL_ON_ERROR(
+		RegCreateKeyEx(root, keyBaseName, 0, NULL,
+		REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &cmderKey, NULL));
+
+	FAIL_ON_ERROR(RegSetValue(cmderKey, L"", REG_SZ, L"Cmder Here", NULL));
+	FAIL_ON_ERROR(RegSetValueEx(cmderKey, L"NoWorkingDirectory", 0, REG_SZ, (BYTE *)L"", 2));
+
+	FAIL_ON_ERROR(RegSetValueEx(cmderKey, L"Icon", 0, REG_SZ, (BYTE *)icoPath, wcslen(icoPath) * sizeof(wchar_t)));
+
+	HKEY command;
+	FAIL_ON_ERROR(
+		RegCreateKeyEx(cmderKey, L"command", 0, NULL,
+		REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &command, NULL));
+
 	FAIL_ON_ERROR(RegSetValue(command, L"", REG_SZ, commandStr, NULL));
 
 	RegCloseKey(command);
@@ -185,19 +200,17 @@ void RegisterShellMenu(std::wstring opt)
 	RegCloseKey(root);
 }
 
-void UnregisterShellMenu(std::wstring opt)
+void UnregisterShellMenu(std::wstring opt, wchar_t* keyBaseName)
 {
 	HKEY root = GetRootKey(opt);
 	HKEY cmderKey;
 	FAIL_ON_ERROR(
-		RegCreateKeyEx(root, SHELL_MENU_REGISTRY_PATH, 0, NULL,
+		RegCreateKeyEx(root, keyBaseName, 0, NULL,
 		REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &cmderKey, NULL));
-#ifdef XP
+#if XP
 	FAIL_ON_ERROR(SHDeleteKey(cmderKey, NULL));
-	FAIL_ON_ERROR(SHDeleteKey(root, SHELL_MENU_REGISTRY_PATH));
 #else
 	FAIL_ON_ERROR(RegDeleteTree(cmderKey, NULL));
-	FAIL_ON_ERROR(RegDeleteKey(root, SHELL_MENU_REGISTRY_PATH));
 #endif
 	RegCloseKey(cmderKey);
 	RegCloseKey(root);
@@ -220,11 +233,13 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 	}
 	else if (streqi(opt.first.c_str(), L"/REGISTER"))
 	{
-		RegisterShellMenu(opt.second);
+		RegisterShellMenu(opt.second, SHELL_MENU_REGISTRY_PATH_BACKGROUND);
+		RegisterShellMenu(opt.second, SHELL_MENU_REGISTRY_PATH_LISTITEM);
 	}
 	else if (streqi(opt.first.c_str(), L"/UNREGISTER"))
 	{
-		UnregisterShellMenu(opt.second);
+		UnregisterShellMenu(opt.second, SHELL_MENU_REGISTRY_PATH_BACKGROUND);
+		UnregisterShellMenu(opt.second, SHELL_MENU_REGISTRY_PATH_LISTITEM);
 	}
 	else
 	{
@@ -233,4 +248,4 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
 	}
 
 	return 0;
-}
+}

pack.rb

@@ -1,40 +0,0 @@
-# Samuel Vasko 2013
-# Cmder packing script -- Creates zip files for relase
-
-require "fileutils"
-
-def create_archive name, exclude
-    if exclude
-        exclude = " -x!cmder\\" + exclude
-    else
-        exclude = ""
-    end
-    system('ls')
-    puts "Running 7z a -x@cmder\\packignore" + exclude + " " + name + " cmder"
-    system("7z a -x@cmder\\packignore" + exclude + " " + name + " cmder")
-end
-
-targets = [
-    ["cmder.zip"],
-    ["cmder.7z"],
-    ["cmder_mini.zip", "vendor\\msysgit"]
-]
-
-unless system("git describe --abbrev=0 --tags")
-    puts "Failied to get the last tag from git, looks like something is missing"
-end
-
-version = `git describe --abbrev=0 --tags`
-
-FileUtils.touch('Version ' + version.chomp)
-FileUtils.rm('config/.history') if File.exists?('config/.history')
-
-Dir.chdir('..')
-
-targets.each do |ar|
-    create_archive ar[0], ar[1]
-end
-
-Dir.chdir('cmder')
-
-FileUtils.rm('Version ' + version.chomp)

packignore

@@ -1,8 +1,10 @@
-cmder\launcher
+launcher
-cmder\icons
+icons
-cmder\.gitignore
+.gitignore
-cmder\.gitattributes
+.gitattributes
-cmder\.git
+.git
-cmder\*.rb
+*.rb
-cmder\packignore
+build
-cmder\Cmder.bat
+config\.history
+packignore
+Cmder.bat

scripts/build.ps1

@@ -0,0 +1,79 @@
+<#
+.Synopsis
+    Build Cmder
+.DESCRIPTION
+    Use this script to build your own edition of Cmder
+
+    This script builds dependencies from current vendor/sources.json file and unpacks them.
+
+    You will need to make this script executable by setting your Powershell Execution Policy to Remote signed
+    Then unblock the script for execution with UnblockFile .\build.ps1
+.EXAMPLE
+    .\build.ps1
+
+    Executes the default build for cmder, this is equivalent to the "minimum" style package in the releases
+.EXAMPLE
+    .\build -verbose
+
+    Execute the build and see what's going on.
+.EXAMPLE
+    .\build.ps1 -SourcesPath '~/custom/vendors.json'
+
+    Build cmder with your own packages. See vendor/sources.json for the syntax you need to copy.
+.NOTES
+    AUTHORS
+    Samuel Vasko, Jack Bennett
+    Part of the Cmder project.
+.LINK
+    https://github.com/bliker/cmder - Project Home
+#>
+
+[CmdletBinding(SupportsShouldProcess=$true)]
+Param(
+    # CmdletBinding will give us;
+    # -verbose switch to turn on logging and
+    # -whatif switch to not actually make changes
+
+    # Path to the vendor configuration source file
+    [string]$sourcesPath = "..\vendor\sources.json",
+
+    # Vendor folder location
+    [string]$saveTo = "..\vendor\",
+
+    # Launcher folder location
+    [string]$launcher = "..\launcher"
+)
+
+. "$PSScriptRoot\utils.ps1"
+$ErrorActionPreference = "Stop"
+
+Push-Location -Path $saveTo
+$sources = Get-Content $sourcesPath | Out-String | Convertfrom-Json
+
+# Check for requirements
+Ensure-Exists $sourcesPath
+Ensure-Executable "7z"
+
+foreach ($s in $sources) {
+    Write-Verbose "Getting $($s.name) from URL $($s.url)"
+
+    # We do not care about the extensions/type of archive
+    $tempArchive = "$($s.name).tmp"
+    Delete-Existing $tempArchive
+    Delete-Existing $s.name
+
+    Invoke-WebRequest -Uri $s.url -OutFile $tempArchive -ErrorAction Stop
+    Extract-Archive $tempArchive $s.name
+
+    if ((Get-Childitem $s.name).Count -eq 1) {
+        Flatten-Directory($s.name)
+    }
+}
+
+Pop-Location
+
+Push-Location -Path $launcher
+msbuild CmderLauncher.vcxproj /p:configuration=Release
+Pop-Location
+
+Write-Verbose "All good and done!"

scripts/pack.ps1

@@ -0,0 +1,57 @@
+<#
+.Synopsis
+    Pack cmder
+.DESCRIPTION
+    Use this script to pack cmder into release archives
+
+    You will need to make this script executable by setting your Powershell Execution Policy to Remote signed
+    Then unblock the script for execution with UnblockFile .\pack.ps1
+.EXAMPLE
+    .\pack.ps1
+
+    Creates default archives for cmder
+.EXAMPLE
+    .\build -verbose
+
+    Creates default archives for cmder with plenty of information
+.NOTES
+    AUTHORS
+    Samuel Vasko, Jack Bennett
+    Part of the Cmder project.
+.LINK
+    https://github.com/bliker/cmder - Project Home
+#>
+
+[CmdletBinding(SupportsShouldProcess=$true)]
+Param(
+    # CmdletBinding will give us;
+    # -verbose switch to turn on logging and
+    # -whatif switch to not actually make changes
+
+    # Path to the vendor configuration source file
+    [string]$cmderRoot = "..",
+
+    # Vendor folder locaton
+    [string]$saveTo = "..\build"
+)
+
+. "$PSScriptRoot\utils.ps1"
+$ErrorActionPreference = "Stop"
+Ensure-Executable "7z"
+
+$targets = @{
+    "cmder.zip" = $null;
+    "cmder.7z" = $null;
+    "cmder_mini.zip" = "-x!`"vendor\msysgit`"";
+}
+
+Delete-Existing "..\Version*"
+
+$version = Invoke-Expression "git describe --abbrev=0 --tags"
+(New-Item -ItemType file "$cmderRoot\Version $version") | Out-Null
+
+foreach ($t in $targets.GetEnumerator()) {
+    Create-Archive $cmderRoot "$saveTo\$($t.Name)" $t.Value
+    $hash = (Digest-MD5 "$saveTo\$($t.Name)")
+    Add-Content "$saveTo\hashes.txt" $hash
+}

scripts/utils.ps1

@@ -0,0 +1,58 @@
+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 {
+        If( ($command -eq "7z") -and (Test-Path "$env:programfiles\7-zip\7z.exe") ){
+            set-alias -Name "7z" -Value "$env:programfiles\7-zip\7z.exe" -Scope script
+        }
+        ElseIf( ($command -eq "7z") -and (Test-Path "$env:programw6432\7-zip\7z.exe") ) {
+            set-alias -Name "7z" -Value "$env:programw6432\7-zip\7z.exe" -Scope script             
+        }
+        Else {
+            Write-Error "Missing $command! Ensure it is installed and on in the PATH"
+            exit 1
+        }
+    }
+}
+
+function Delete-Existing ($path) {
+    Write-Verbose "Remove $path"
+    Remove-Item -Recurse -force $path -ErrorAction SilentlyContinue
+}
+
+function Extract-Archive ($source, $target) {
+    Invoke-Expression "7z x -y -o$($target) $source  > `$null"
+    if ($lastexitcode -ne 0) {
+        Write-Error "Extracting of $source failied"
+    }
+    Remove-Item $source
+}
+
+function Create-Archive ($source, $target, $params) {
+    $command = "7z a -x@`"$source\packignore`" $params $target $source  > `$null"
+    Write-Verbose "Running: $command"
+    Invoke-Expression $command
+    if ($lastexitcode -ne 0) {
+        Write-Error "Compressing $source failied"
+    }
+}
+
+# If directory contains only one child directory
+# Flatten it instead
+function Flatten-Directory ($name) {
+    $child = (Get-Childitem $name)[0]
+    Rename-Item $name -NewName "$($name)_moving"
+    Move-Item -Path "$($name)_moving\$child" -Destination $name
+    Remove-Item -Recurse "$($name)_moving"
+}
+
+function Digest-MD5 ($path) {
+    return Invoke-Expression "md5sum $path"
+}

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
@@ -24,12 +29,18 @@
 
 :: Enhance Path
 @set git_install_root=%CMDER_ROOT%\vendor\msysgit
-@set PATH=%CMDER_ROOT%\bin;%git_install_root%\bin;%git_install_root%\mingw\bin;%git_install_root%\cmd;%git_install_root%\share\vim\vim73;%PATH%
+@set PATH=%CMDER_ROOT%\bin;%git_install_root%\bin;%git_install_root%\mingw\bin;%git_install_root%\cmd;%git_install_root%\share\vim\vim74;%CMDER_ROOT%;%PATH%
 
 :: Add aliases
 @doskey /macrofile="%CMDER_ROOT%\config\aliases"
 
 :: Set home path
-@set HOME=%USERPROFILE%
+@if not defined HOME set HOME=%USERPROFILE%
 
-@if defined CMDER_START cd /d "%CMDER_START%"
+@if defined CMDER_START (
+    @cd /d "%CMDER_START%"
+) else (
+    @if "%CD%\" == "%CMDER_ROOT%" (
+        @cd /d "%HOME%"
+    )
+)

vendor/sources.json

@@ -0,0 +1,17 @@
+[
+    {
+        "name": "msysgit",
+        "version": "1.9.4-preview",
+        "url": "https://github.com/msysgit/msysgit/releases/download/Git-1.9.4-preview20140611/PortableGit-1.9.4-preview20140611.7z"
+    },
+    {
+        "name": "clink",
+        "version": "0.4.2",
+        "url": "https://github.com/mridgers/clink/releases/download/0.4.2/clink_0.4.2.zip"
+    },
+    {
+        "name": "conemu-maximus5",
+        "version": "140707",
+        "url": "https://conemu.codeplex.com/downloads/get/880090"
+    }
+]