Added icon

Allow use of Vim from msysgit.

.gitattributes

@@ -0,0 +1,2 @@
+# Auto detect text files and perform LF normalization
+* text=auto

.gitignore

@@ -3,4 +3,7 @@
 
 vendor/*
 !vendor/*.md
-!vendor/*.bat
+!vendor/*.bat
+config/.history
+Thumbs.db
+*.exe

Cmder.bat

@@ -1,2 +1,3 @@
 @echo off
-start vendor/ConEmu/ConEmu.exe /Title Cmder /LoadCfgFile ../../config/ConEmu.xml
+SET CMDER_ROOT=%~dp0
+start %~dp0/vendor/conemu-maximus5/ConEmu.exe /Icon "%CMDER_ROOT%\icons\cmder.ico" /Title Cmder /LoadCfgFile "%CMDER_ROOT%\config\ConEmu.xml"

Readme.md

@@ -8,7 +8,7 @@ Cmder is a **software package** created out of pure frustration over absence of
 
 ## Why use it
 
-The main advantage of Cmder is portablibity. It is designed to be totally self-container. With no external dependencies. That makes is great for **USB Sticks** or **Dropbox**. So you can carry your console, aliases and binaries (like wget, curl and git) with you anywhere.
+The main advantage of Cmder is portability. It is designed to be totally self-contained with no external dependencies. That makes is great for **USB Sticks** or **Dropbox**. So you can carry your console, aliases and binaries (like wget, curl and git) with you anywhere.
 
 ## Installation
 
@@ -74,4 +74,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

bin/Readme.md

@@ -1,3 +1,3 @@
 ## Bin
 
-Thif folder will be injected into path at runtime
+This folder will be injected into path at runtime

bin/alias.bat

@@ -1,4 +1,28 @@
 @echo off
+if ["%1"] == ["/?"] goto:p_help
+if ["%2"] == [""] echo Insufficient parameters. & goto:p_help
+::validate alias
+setlocal
+for /f "delims== tokens=1" %%G in ("%*") do set _temp2=%%G
+
+	set _temp=%_temp2: =%
+
+if not ["%_temp%"] == ["%_temp2%"] (
+	echo Your alias name can not contain a space
+	endlocal
+	goto:eof
+)
+
 echo %* >> %~dp0..\config\aliases
 doskey /macrofile=%~dp0..\config\aliases
 echo Alias created
+endlocal
+goto:eof
+
+:p_help
+echo.Usage:
+echo.	alias name=full command
+echo.	$* allows the alias to assume all the parameters of the supplied command.
+echo.	$1-$9 Allows you to seperate parameter by number, much like %%1 in batch.
+echo.	$T is the command seperator, allowing you to string several commands together into one alias.
+echo.	For more information, read DOSKEY/?

build_cmder.rb

@@ -0,0 +1,70 @@
+# 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'
+
+def get_file project, query
+    # Should be changed to integrated downloader
+    urlToFile = 'wget -q -O - "http://samuelvasko.tk/gcode/?project='+project+'&query='+query+'"'
+    urlToFile = `#{urlToFile}`
+    urlToFile =  urlToFile.split("\n").first
+
+    extension = urlToFile.split('.').last
+    filename = project+'.'+extension
+
+    puts "\n ------ Downloading #{project} ------- \n \n"
+    get_file = system("wget -O #{filename} #{urlToFile}")
+
+    unless get_file
+        puts "Failied to download #{project} from #{urlToFile}"
+        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
+
+puts '
+______       _ _     _ _                                   _
+| ___ \     (_) |   | (_)                                 | |
+| |_/ /_   _ _| | __| |_ _ __   __ _     ___ _ __ ___   __| | ___ _ __
+| ___ \ | | | | |/ _` | | \'_ \ / _` |   / __| \'_ ` _ \ / _` |/ _ \ \'__|
+| |_/ / |_| | | | (_| | | | | | (_| |  | (__| | | | | | (_| |  __/ |
+\____/ \__,_|_|_|\__,_|_|_| |_|\__, |   \___|_| |_| |_|\__,_|\___|_|
+                                __/ |
+                               |___/
+'
+
+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 'Done, bye'

config/.history

@@ -1 +0,0 @@
-

config/ConEmu.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <key name="Software">
 	<key name="ConEmu">
-		<key name=".Vanilla" modified="2013-07-16 16:32:45">
+		<key name=".Vanilla" modified="2013-11-29 12:17:57" build="131107">
 			<value name="ColorTable00" type="dword" data="00222827"/>
 			<value name="ColorTable01" type="dword" data="009e5401"/>
 			<value name="ColorTable02" type="dword" data="0004aa74"/>
@@ -125,10 +125,10 @@
 			<value name="UseCurrentSizePos" type="hex" data="01"/>
 			<value name="WindowMode" type="dword" data="0000051f"/>
 			<value name="ConWnd Width" type="dword" data="0000006f"/>
-			<value name="ConWnd Height" type="dword" data="00000026"/>
+			<value name="ConWnd Height" type="dword" data="0000001a"/>
 			<value name="Cascaded" type="hex" data="01"/>
-			<value name="ConWnd X" type="dword" data="00000108"/>
-			<value name="ConWnd Y" type="dword" data="000000c1"/>
+			<value name="ConWnd X" type="dword" data="000000bc"/>
+			<value name="ConWnd Y" type="dword" data="00000065"/>
 			<value name="16bit Height" type="dword" data="00000000"/>
 			<value name="AutoSaveSizePos" type="hex" data="00"/>
 			<value name="IntegralSize" type="hex" data="00"/>
@@ -249,7 +249,7 @@
 			<value name="StatusBar.Hide.Proc" type="hex" data="00"/>
 			<value name="StatusBar.Hide.Title" type="hex" data="01"/>
 			<value name="StatusBar.Hide.Resize" type="hex" data="00"/>
-			<value name="Tabs" type="hex" data="02"/>
+			<value name="Tabs" type="hex" data="01"/>
 			<value name="TabsLocation" type="hex" data="01"/>
 			<value name="TabSelf" type="hex" data="01"/>
 			<value name="TabLazy" type="hex" data="01"/>
@@ -329,7 +329,7 @@
 			<value name="Update.CheckOnStartup" type="hex" data="01"/>
 			<value name="Update.CheckHourly" type="hex" data="00"/>
 			<value name="Update.ConfirmDownload" type="hex" data="01"/>
-			<value name="Update.UseBuilds" type="hex" data="02"/>
+			<value name="Update.UseBuilds" type="hex" data="01"/>
 			<value name="Update.UseProxy" type="hex" data="00"/>
 			<value name="Update.Proxy" type="string" data=""/>
 			<value name="Update.ProxyUser" type="string" data=""/>
@@ -411,9 +411,9 @@
 			<value name="Key.JumpNextMonitor" type="dword" data="80808000"/>
 			<value name="Key.TileToLeft" type="dword" data="80808000"/>
 			<value name="Key.TileToRIght" type="dword" data="80808000"/>
-			<value name="KeyMacro01" type="dword" data="00121131"/>
+			<value name="KeyMacro01" type="dword" data="0012a031"/>
 			<value name="KeyMacro01.Text" type="string" data="Task(&quot;cmd&quot;)"/>
-			<value name="KeyMacro02" type="dword" data="00121132"/>
+			<value name="KeyMacro02" type="dword" data="0012a032"/>
 			<value name="KeyMacro02.Text" type="string" data="Task(&quot;PowerShell&quot;)"/>
 			<value name="KeyMacro03" type="dword" data="00000000"/>
 			<value name="KeyMacro03.Text" type="string" data=""/>
@@ -483,28 +483,30 @@
 			<value name="DndLKey" type="hex" data="00"/>
 			<value name="DndRKey" type="hex" data="a2"/>
 			<value name="WndDragKey" type="dword" data="00121101"/>
-				<key name="Tasks" modified="2013-07-16 16:32:45">
+				<key name="Tasks" modified="2013-11-29 12:17:57" build="131107">
 				<value name="Count" type="dword" data="00000002"/>
-						<key name="Task1" modified="2013-07-16 16:32:45">
+						<key name="Task1" modified="2013-11-29 12:17:57" 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 vendor\init.bat"/>
+					<value name="Cmd1" type="string" data="cmd /k %CMDER_ROOT%\vendor\init.bat"/>
 					<value name="Active" type="dword" data="00000000"/>
 					<value name="Count" type="dword" data="00000001"/>
+					<value name="Hotkey" type="dword" data="00000000"/>
 				</key>
-						<key name="Task2" modified="2013-07-16 16:32:45">
+						<key name="Task2" modified="2013-11-29 12:17:57" build="131107">
 					<value name="Name" type="string" data="{PowerShell}"/>
 					<value name="GuiArgs" type="string" data="/dir &quot;%userprofile%&quot;"/>
 					<value name="Cmd1" type="string" data="powershell"/>
 					<value name="Active" type="dword" data="00000000"/>
 					<value name="Count" type="dword" data="00000001"/>
+					<value name="Hotkey" type="dword" data="00000000"/>
 				</key>
 			</key>
-				<key name="Apps" modified="2013-07-16 16:32:45">
+				<key name="Apps" modified="2013-11-29 12:17:57" build="131107">
 				<value name="Count" type="dword" data="00000000"/>
 			</key>
-				<key name="Colors" modified="2013-07-16 16:32:45">
-			<key name="Palette1" modified="2013-07-16 16:32:45">
+				<key name="Colors" modified="2013-11-29 12:17:57" build="131107">
+			<key name="Palette1" modified="2013-11-29 12:17:57" build="131107">
 					<value name="Name" type="string" data="Monokai"/>
 					<value name="ExtendColors" type="hex" data="00"/>
 					<value name="ExtendColorIdx" type="hex" data="0e"/>
@@ -547,6 +549,30 @@
 				</key>
 				<value name="Count" type="dword" data="00000001"/>
 			</key>
+			<value name="OneTabPerGroup" type="hex" data="00"/>
+			<value name="ActivateSplitMouseOver" type="hex" data="01"/>
+			<value name="TabBtnDblClick" type="dword" data="00000000"/>
+			<value name="ConsoleExceptionHandler" type="hex" data="00"/>
+			<value name="SaveCmdHistory" type="hex" data="00"/>
+			<value name="CTS.IBeam" type="hex" data="01"/>
+			<value name="Multi.SplitSizeVU" type="dword" data="00105d26"/>
+			<value name="Multi.SplitSizeVD" type="dword" data="00105d28"/>
+			<value name="Multi.SplitSizeHL" type="dword" data="00105d25"/>
+			<value name="Multi.SplitSizeHR" type="dword" data="00105d27"/>
+			<value name="Multi.SplitFocusU" type="dword" data="00005d26"/>
+			<value name="Multi.SplitFocusD" type="dword" data="00005d28"/>
+			<value name="Multi.SplitFocusL" type="dword" data="00005d25"/>
+			<value name="Multi.SplitFocusR" type="dword" data="00005d27"/>
+			<value name="CloseGroupPrcKey" type="dword" data="00000000"/>
+			<value name="SetDefaultTerminalStartupTSA" type="hex" data="01"/>
+			<value name="CTS.HtmlFormat" type="hex" data="00"/>
+			<value name="TabIcons" type="hex" data="01"/>
+			<value name="Multi.NewConsolePopup2" type="dword" data="00000000"/>
+			<value name="CloseAllConKey" type="dword" data="00000000"/>
+			<value name="CloseExceptConKey" type="dword" data="00000000"/>
+			<value name="CTS.VkCopyFmt0" type="dword" data="00001143"/>
+			<value name="CTS.VkCopyFmt1" type="dword" data="00101143"/>
+			<value name="CTS.VkCopyFmt2" type="dword" data="00000000"/>
 		</key>
 	</key>
 </key>

config/aliases

@@ -1,3 +1,4 @@
 e.=explorer .
-gl=git log --oneline --all --graph --decorate
-hej=dir 
+gl=git log --oneline --all --graph --decorate  $*
+ls=ls --color $*
+pwd=cd

config/git.lua

@@ -0,0 +1,50 @@
+---
+ -- Find out current branch
+ -- @return {false|git branch name}
+---
+function get_git_branch()
+    for line in io.popen("git branch 2>nul"):lines() do
+        local m = line:match("%* (.+)$")
+        if m then
+            return m
+        end
+    end
+
+    return false
+end
+
+---
+ -- Get the status of working dir
+ -- @return {bool}
+---
+function get_git_status()
+    return os.execute("git diff-files --quiet --ignore-submodules")
+end
+
+function git_prompt_filter()
+
+    -- Colors for git status
+    local colors = {
+        clean = "\x1b[1;37;40m",
+        dirty = "\x1b[31;1m",
+    }
+
+    local branch = get_git_branch()
+    if branch then
+        -- Has branch => therefore it is a git folder, now figure out status
+        if get_git_status() then
+            color = colors.clean
+        else
+            color = colors.dirty
+        end
+
+        clink.prompt.value = string.gsub(clink.prompt.value, "{git}", color.."("..branch..")")
+        return true
+    end
+
+    -- No git present or not in git file
+    clink.prompt.value = string.gsub(clink.prompt.value, "{git}", "")
+    return false
+end
+
+clink.prompt.register_filter(git_prompt_filter, 50)

vendor/Readme.md

@@ -1,3 +1,3 @@
 ## Vendor
 
-Softwere from third parties + init sctipt
+Software from third parties + init sctipt

vendor/init.bat

@@ -1,25 +1,43 @@
-@echo off
+:: Init Script for cmd.exe
+:: Sets some nice defaults
+:: Created as part of cmder project
+
+
+:: Setting prompt style
+@for /f "tokens=2 delims=:." %%x in ('chcp') do @set cp=%%x
+:: The slow part
+:: World without Unicode is a sad world
+@chcp 65001>nul
+:: It has to be lambda, I already made a logo
+@prompt $E[1;32;40m$P$S{git}$S$_$E[1;30;40mλ$S$E[0m
+@chcp %cp%>nul
 
-:: Set prompt style
-prompt $E[1;32;40m$P $_$E[1;30;40m$$ $E[0m
 
 :: Pick right version of clink
-if "%PROCESSOR_ARCHITECTURE%"=="x86" (
+@if "%PROCESSOR_ARCHITECTURE%"=="x86" (
     set architecture=86
 ) else (
     set architecture=64
 )
 
-:: Run clink
-vendor\clink\clink_x%architecture%.exe inject --quiet --profile config
+@set rootDir="%~dp0\.."
 
-set rootDir=%CD%
+:: Run clink
+@%rootDir%\vendor\clink\clink_x%architecture%.exe inject --quiet --profile %rootDir%\config
+
+:: Prepare for msysgit
+
+:: I do not even know, copypasted from their .bat
+@set PLINK_PROTOCOL=ssh
+@if not defined TERM set TERM=msys
 
 :: Enhance Path
-PATH=%PATH%;%rootDir%\bin
+@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;
 
 :: Add aliases
-doskey /macrofile=%rootDir%\config\aliases
+@doskey /macrofile="%rootDir%\config\aliases"
 
-:: cd into users homedir
-cd /d "%userprofile%"
+:: Set home path
+@set HOME=%USERPROFILE%
+@echo Welcome to cmder!