Faster dot source

Cmder.bat

@@ -1,7 +1,7 @@
 @echo off
 SET CMDER_ROOT=%~dp0
 
-:: Remove trailing '\'
+:: Remove Trailing '\'
 @if "%CMDER_ROOT:~-1%" == "\" SET CMDER_ROOT=%CMDER_ROOT:~0,-1%
 
 if exist "%~1" (

README.md

@@ -38,6 +38,9 @@ In a file explorer window right click in or on a directory to see "Cmder Here" i
 * <kbd>Ctrl</kbd> + <kbd>W</kbd> : Close tab
 * <kbd>Ctrl</kbd> + <kbd>D</kbd> : Close tab (if pressed on empty command)
 * <kbd>Shift</kbd> + <kbd>Alt</kbd> + <kbd>#Number</kbd> : Fast new tab: <kbd>1</kbd> - CMD, <kbd>2</kbd> - PowerShell
+* <kbd>Ctrl</kbd> + <kbd>Tab</kbd> : Switch to next tab
+* <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Tab</kbd> : Switch to previous tab
+* <kbd>Ctrl</kbd> + <kbd>#Number</kbd> : Switch to tab #Number
 * <kbd>Alt</kbd> + <kbd>Enter</kbd>: Fullscreen
 
 ### Shell
@@ -59,7 +62,7 @@ You can open multiple tabs each containing one of the following shells:
 |Cmder|cmd.exe|Windows 'cmd.exe' shell enhanced with Git, Git aware prompt, Clink(GNU Readline), and Aliases.|
 |Cmder as Admin|cmd.exe|Administrative Windows 'cmd.exe' Cmder shell.|
 |PowerShell|powershell.exe|Windows PowerShell enhanced with Git and Git aware prompt .|
-|PowerShell as Admin|powershell.exe|Administrative Windows 'powerhell.exe' Cmder shell.|
+|PowerShell as Admin|powershell.exe|Administrative Windows 'powershell.exe' Cmder shell.|
 |Bash|bash.exe|Unix/Linux like bash shell running on Windows.|
 |Bash as Admin|bash.exe|Administrative Unix/Linux like bash shell running on Windows.|
 |Mintty|bash.exe|Unix/Linux like bash shell running on Windows. See below for Mintty configuration differences|
@@ -91,7 +94,7 @@ User specific configuration is possible using the cmder specific shell config fi
 |PowerShell|$ENV:CMDER_ROOT\config\user-profile.ps1|
 |Bash/Mintty|$CMDER_ROOT/config/user-profile.sh|
 
-Note: Bash and Mintty sessions will also source the '$HOME/.bashrc' file it it exists after it sources '$CMDER_ROOT/config/user-profile.sh'.
+Note: Bash and Mintty sessions will also source the '$HOME/.bashrc' file if it exists after it sources '$CMDER_ROOT/config/user-profile.sh'.
 
 ### Linux like 'profile.d' support for all supported shell types.
 You can write *.cmd|*.bat, *.ps1, and *.sh scripts and just drop them in the %CMDER_ROOT%\config\profile.d folder to add startup config to Cmder.
@@ -114,7 +117,7 @@ Aliases defined using the `alias.bat` command will automatically be saved in the
 #### Bash.exe|Mintty.exe Aliases
 Bash shells support simple and complex aliases with optional parameters natively so they work a little different.  Typing `alias name=command` will create an alias only for the current running session.  To make an alias permanent add it to either your `$CMDER_ROOT/config/user-profile.sh` or your `$HOME/.bashrc`.
 
-If you add bash aliases to `$CMDER_ROOT/config/user-profile.sh` they will portable and follow your Cmder folder if you copy it to another machine.  `$HOME/.bashrc` defined aliases are not portable.
+If you add bash aliases to `$CMDER_ROOT/config/user-profile.sh` they will be portable and follow your Cmder folder if you copy it to another machine.  `$HOME/.bashrc` defined aliases are not portable.
 
 #### PowerShell.exe Aliases
 PowerShell has native simple alias support, for example `[new-alias | set-alias] alias command`, so complex aliases with optional parameters are not supported in PowerShell sessions.  Type `get-help [new-alias|set-alias] -full` for help on PowerShell aliases.

appveyor.yml

@@ -44,6 +44,9 @@ artifacts:
   - path: build\cmder_mini.zip
     name: cmdermini
 
+  - path: build\hashes.txt
+    name: hashes
+
 #---------------------------------#
 #         notifications           #
 #---------------------------------#

bin/alias.bat

@@ -64,7 +64,7 @@ if "%aliases%" neq "%CMDER_ROOT%\config\user-aliases.cmd" (
 )
 
 :: validate alias
-for /f "delims== tokens=1,2 usebackq" %%G in (`echo "%_x%"`) do (
+for /f "delims== tokens=1,* usebackq" %%G in (`echo "%_x%"`) do (
   set alias_name=%%G
   set alias_value=%%H
 )

config/Readme.md

@@ -5,8 +5,8 @@ directly, it has to be hardlinked.
 
 * `aliases`: aliases in cmd; called form vendor\init.bat; autocreated from
   `vendor\aliases.example`.
-* `*.lua`: clink completitions and prompt filters; called from vendor\cmder.lua after all
-  other prompt filter and clink completitons are initialized; add your own.
+* `*.lua`: clink completions and prompt filters; called from vendor\cmder.lua after all
+  other prompt filter and clink completions are initialized; add your own.
 * `user_profile.{sh|bat|ps1}`: startup files for bash|cmd|powershell tasks; called from their
   respective startup scripts in `vendor\`; autocreated on first start of such a task
 * `.history`: the current commandline history; autoupdated on close

launcher/src/CmderLauncher.cpp

@@ -103,6 +103,9 @@ void StartCmder(std::wstring path, bool is_single_mode)
 	wchar_t exeDir[MAX_PATH] = { 0 };
 	wchar_t icoPath[MAX_PATH] = { 0 };
 	wchar_t cfgPath[MAX_PATH] = { 0 };
+	wchar_t backupCfgPath[MAX_PATH] = { 0 };
+	wchar_t cpuCfgPath[MAX_PATH] = { 0 };
+	wchar_t userCfgPath[MAX_PATH] = { 0 };
 	wchar_t oldCfgPath[MAX_PATH] = { 0 };
 	wchar_t conEmuPath[MAX_PATH] = { 0 };
 	wchar_t args[MAX_PATH * 2 + 256] = { 0 };
@@ -117,19 +120,27 @@ void StartCmder(std::wstring path, bool is_single_mode)
 
 	PathCombine(icoPath, exeDir, L"icons\\cmder.ico");
 
-	// Check for machine-specific config file.
-	PathCombine(oldCfgPath, exeDir, L"config\\ConEmu-%COMPUTERNAME%.xml");
-	ExpandEnvironmentStrings(oldCfgPath, oldCfgPath, sizeof(oldCfgPath) / sizeof(oldCfgPath[0]));
-	if (!PathFileExists(oldCfgPath)) {
+	// Check for machine-specific then user config source file.
+	PathCombine(cpuCfgPath, exeDir, L"config\\ConEmu-%COMPUTERNAME%.xml");
+	ExpandEnvironmentStrings(cpuCfgPath, cpuCfgPath, sizeof(cpuCfgPath) / sizeof(cpuCfgPath[0]));
+
+	PathCombine(userCfgPath, exeDir, L"config\\user-ConEmu.xml");
+
+	if (PathFileExists(cpuCfgPath)) {
+		wcsncpy_s(oldCfgPath, cpuCfgPath, sizeof(cpuCfgPath));
+		wcsncpy_s(backupCfgPath, cpuCfgPath, sizeof(cpuCfgPath));
+	}
+	else if (PathFileExists(userCfgPath)) {
+		wcsncpy_s(oldCfgPath, userCfgPath,sizeof(userCfgPath));
+		wcsncpy_s(backupCfgPath, userCfgPath, sizeof(userCfgPath));
+	}
+	else {
 		PathCombine(oldCfgPath, exeDir, L"config\\ConEmu.xml");
+		wcsncpy_s(backupCfgPath, userCfgPath, sizeof(userCfgPath));
 	}
 
-	// Check for machine-specific config file.
-	PathCombine(cfgPath, exeDir, L"vendor\\conemu-maximus5\\ConEmu-%COMPUTERNAME%.xml");
-	ExpandEnvironmentStrings(cfgPath, cfgPath, sizeof(cfgPath) / sizeof(cfgPath[0]));
-	if (!PathFileExists(cfgPath)) {
-		PathCombine(cfgPath, exeDir, L"vendor\\conemu-maximus5\\ConEmu.xml");
-	}
+	// Set path to vendored ConEmu config file
+	PathCombine(cfgPath, exeDir, L"vendor\\conemu-maximus5\\ConEmu.xml");
 
 	SYSTEM_INFO sysInfo;
 	GetNativeSystemInfo(&sysInfo);
@@ -151,6 +162,14 @@ void StartCmder(std::wstring path, bool is_single_mode)
 			exit(1);
 		}
 	}
+	else if (!CopyFile(cfgPath, backupCfgPath, FALSE))
+	{
+		MessageBox(NULL,
+			(GetLastError() == ERROR_ACCESS_DENIED)
+			? L"Failed to backup ConEmu.xml file to ./config folder!"
+			: L"Failed to backup ConEmu.xml file to ./config folder!", MB_TITLE, MB_ICONSTOP);
+		exit(1);
+	}
 
 	if (is_single_mode)
 	{
@@ -169,21 +188,23 @@ void StartCmder(std::wstring path, bool is_single_mode)
 		}
 	}
 	// Ensure EnvironmentVariables are propagated.
-	SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, (LPARAM)"Environment", SMTO_ABORTIFHUNG, 5000, NULL);
-	SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, (LPARAM) L"Environment", SMTO_ABORTIFHUNG, 5000, NULL); // For Windows >= 8
+
 
 	STARTUPINFO si = { 0 };
 	si.cb = sizeof(STARTUPINFO);
 #if USE_TASKBAR_API
 	si.lpTitle = appId;
 	si.dwFlags = STARTF_TITLEISAPPID;
 #endif
-
 	PROCESS_INFORMATION pi;
 	if (!CreateProcess(conEmuPath, args, NULL, NULL, false, 0, NULL, NULL, &si, &pi)) {
 		MessageBox(NULL, _T("Unable to create the ConEmu Process!"), _T("Error"), MB_OK);
 		return;
 	}
+
+	LRESULT lr = SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, (LPARAM)"Environment", SMTO_ABORTIFHUNG | SMTO_NOTIMEOUTIFNOTHUNG, 5000, NULL);
+	lr = SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, (LPARAM) L"Environment", SMTO_ABORTIFHUNG | SMTO_NOTIMEOUTIFNOTHUNG, 5000, NULL); // For Windows >= 8
+
 }
 
 bool IsUserOnly(std::wstring opt)

scripts/build.ps1

@@ -53,6 +53,10 @@ Param(
     [switch]$Compile
 )
 
+# Get the scripts and cmder root dirs we are building in.
+$ScriptRoot = Split-Path -Parent -Path $MyInvocation.MyCommand.Definition
+$cmder_root = $ScriptRoot.replace("\scripts","")
+
 # Dot source util functions into this scope
 . ".\utils.ps1"
 $ErrorActionPreference = "Stop"
@@ -75,6 +79,14 @@ if ($config -ne "") {
     } else { $ConEmuXml = "" }
 } else { $ConEmuXml = "" }
 
+# Kill ssh-agent.exe if it is running from the $env:cmder_root we are building
+foreach ($ssh_agent in $(get-process ssh-agent -erroraction silentlycontinue)) {
+  if ([string]$($ssh_agent.path) -match [string]$cmder_root.replace('\','\\')) {
+    write-verbose $("Stopping " + $ssh_agent.path + "!")
+    stop-process $ssh_agent.id
+  }
+}
+
 $vend = $pwd
 foreach ($s in $sources) {
     Write-Verbose "Getting $($s.name) from URL $($s.url)"

scripts/utils.ps1

@@ -28,6 +28,7 @@ function Delete-Existing ($path) {
 }
 
 function Extract-Archive ($source, $target) {
+    Write-Verbose $("Extracting Archive '$cmder_root\vendor\" + $source.replace('/','\') + " to '$cmder_root\vendor\$target'")
     Invoke-Expression "7z x -y -o`"$($target)`" `"$source`"  > `$null"
     if ($lastexitcode -ne 0) {
         Write-Error "Extracting of $source failied"

vendor/clink.lua

@@ -18,12 +18,34 @@ dofile(clink_lua_file)
  -- which echo) don't get the ugly '{lamb}' shown.
 ---
 function set_prompt_filter()
+    -- get_cwd() is differently encoded than the clink.prompt.value, so everything other than
+    -- pure ASCII will get garbled. So try to parse the current directory from the original prompt
+    -- and only if that doesn't work, use get_cwd() directly.
+    -- The matching relies on the default prompt which ends in X:\PATH\PATH>
+    -- (no network path possible here!)
+    local old_prompt = clink.prompt.value
+    local cwd = old_prompt:match('.*(.:[^>]*)>')
+    if cwd == nil then cwd = clink.get_cwd() end
+
+    -- environment systems like pythons virtualenv change the PROMPT and usually
+    -- set some variable. But the variables are differently named and we would never
+    -- get them all, so try to parse the env name out of the PROMPT.
+    -- envs are usually put in round or square parentheses and before the old prompt
+    local env = old_prompt:match('.*%(([^%)]+)%).+:')
+    -- also check for square brackets
+    if env == nil then env = old_prompt:match('.*%[([^%]]+)%].+:') end
+
+    -- build our own prompt
     -- orig: $E[1;32;40m$P$S{git}{hg}$S$_$E[1;30;40m{lamb}$S$E[0m
     -- color codes: "\x1b[1;37;40m"
-    cwd = clink.get_cwd()
-    prompt = "\x1b[1;32;40m{cwd} {git}{hg} \n\x1b[1;30;40m{lamb} \x1b[0m"
-    new_value = string.gsub(prompt, "{cwd}", cwd)
-    clink.prompt.value = string.gsub(new_value, "{lamb}", "λ")
+    local cmder_prompt = "\x1b[1;32;40m{cwd} {git}{hg} \n\x1b[1;30;40m{lamb} \x1b[0m"
+    cmder_prompt = string.gsub(cmder_prompt, "{cwd}", cwd)
+    if env == nil then
+        lambda = "λ"
+    else
+        lambda = "("..env..") λ"
+    end
+    clink.prompt.value = string.gsub(cmder_prompt, "{lamb}", lambda)
 end
 
 ---
@@ -142,8 +164,8 @@ end
  -- @return {bool}
 ---
 function get_hg_status()
-    for line in io.popen("hg status"):lines() do
-        return false
+    for line in io.popen("hg status -0"):lines() do
+       return false
     end
     return true
 end

vendor/cmder.sh

@@ -38,25 +38,25 @@ export PATH
 # Drop *.sh or *.zsh files into "${CMDER_ROOT}\config\profile.d"
 # to source them at startup.
 if [ ! -d "${CMDER_ROOT}/config/profile.d" ] ; then
-  mkdir -p ${CMDER_ROOT}/config/profile.d
+  mkdir -p "${CMDER_ROOT}/config/profile.d"
 fi
 
 if [ -d "${CMDER_ROOT}/config/profile.d" ] ; then
   unset profile_d_scripts
-  pushd ${CMDER_ROOT}/config/profile.d >/dev/null
-  profile_d_scripts=$(ls ${CMDER_ROOT}/config/profile.d/*.sh 2>/dev/null)
+  pushd "${CMDER_ROOT}/config/profile.d" >/dev/null
+  profile_d_scripts=$(ls *.sh 2>/dev/null)
 
   if [ ! "x${profile_d_scripts}" = "x" ] ; then
     for x in ${profile_d_scripts} ; do
-      # echo Sourcing "${x}"...
-      . $x
+      # echo Sourcing "${CMDER_ROOT}/config/profile.d/${x}"...
+      . "${CMDER_ROOT}/config/profile.d/${x}"
     done
   fi
   popd >/dev/null
 fi
 
-if [ -f ${CMDER_ROOT}/config/user-profile.sh ] ; then
-    . ${CMDER_ROOT}/config/user-profile.sh
+if [ -f "${CMDER_ROOT}/config/user-profile.sh" ] ; then
+    . "${CMDER_ROOT}/config/user-profile.sh"
 else
     echo Creating user startup file: "${CMDER_ROOT}/config/user-profile.sh"
     cat <<-eof >"${CMDER_ROOT}/config/user-profile.sh"

vendor/cmder_exinit

@@ -51,29 +51,29 @@ if [ ! "$CMDER_ROOT" = "" ] ; then
   # Drop *.sh or *.zsh files into "${CMDER_ROOT}\config\profile.d"
   # to source them at startup.
   if [ ! -d "${CMDER_ROOT}/config/profile.d" ] ; then
-    mkdir -p ${CMDER_ROOT}/config/profile.d
+    mkdir -p "${CMDER_ROOT}/config/profile.d"
   fi
 
   if [ -d "${CMDER_ROOT}/config/profile.d" ] ; then
     unset profile_d_scripts
-    pushd ${CMDER_ROOT}/config/profile.d >/dev/null
+    pushd "${CMDER_ROOT}/config/profile.d" >/dev/null
     if [ ! "x${ZSH_VERSION}" = "x"  ]; then
-      profile_d_scripts=$(ls ${CMDER_ROOT}/config/profile.d/*.zsh 2>/dev/null)
+      profile_d_scripts=$(ls *.zsh 2>/dev/null)
     elif [ ! "x${BASH_VERSION}" = "x"  ]; then
-      profile_d_scripts=$(ls ${CMDER_ROOT}/config/profile.d/*.sh 2>/dev/null)
+      profile_d_scripts=$(ls *.sh 2>/dev/null)
     fi
 
     if [ ! "x${profile_d_scripts}" = "x" ] ; then
       for x in ${profile_d_scripts} ; do
-        # echo Sourcing "${x}"...
-        . $x
+        # echo Sourcing "${CMDER_ROOT}/config/profile.d/${x}"...
+        . "${CMDER_ROOT}/config/profile.d/${x}"
       done
     fi
     popd >/dev/null
   fi
 
-  if [ -f ${CMDER_ROOT}/config/user-profile.sh ] ; then
-    . ${CMDER_ROOT}/config/user-profile.sh
+  if [ -f "${CMDER_ROOT}/config/user-profile.sh" ] ; then
+    . "${CMDER_ROOT}/config/user-profile.sh"
   else
     echo Creating user startup file: "${CMDER_ROOT}/config/user-profile.sh"
     cat <<-eof >"${CMDER_ROOT}/config/user-profile.sh"

vendor/init.bat

@@ -121,12 +121,12 @@ if not defined aliases (
 :: Make sure we have a self-extracting user-aliases.cmd file
 setlocal enabledelayedexpansion
 if not exist "%user-aliases%" (
-    echo Creating intial user-aliases store in "%user-aliases%"...
+    echo Creating initial user-aliases store in "%user-aliases%"...
     copy "%CMDER_ROOT%\vendor\user-aliases.cmd.example" "%user-aliases%"
 ) else (
     type "%user-aliases%" | findstr /i ";= Add aliases below here" >nul
     if "!errorlevel!" == "1" (
-        echo Creating intial user-aliases store in "%user-aliases%"...
+        echo Creating initial user-aliases store in "%user-aliases%"...
         copy "%CMDER_ROOT%\%user-aliases%" "%user-aliases%.old_format" 
         copy "%CMDER_ROOT%\vendor\user-aliases.cmd.example" "%user-aliases%" 
     )

vendor/profile.ps1

@@ -92,12 +92,15 @@ if (-not (test-path "$ENV:CMDER_ROOT\config\profile.d")) {
   mkdir "$ENV:CMDER_ROOT\config\profile.d"
 }
 
-pushd $ENV:CMDER_ROOT\config\profile.d
-foreach ($x in ls *.ps1) {
-  # write-host write-host Sourcing $x
-  . $x
+foreach ($file in (Get-ChildItem "$($env:CMDER_ROOT)\config\profile.d" -Filter '*.ps1') ) {
+    # Grab the contents of files at once and parse that as a script block.
+    # faster script loading, see: https://becomelotr.wordpress.com/2017/02/13/expensive-dot-sourcing/
+    . (
+        [scriptblock]::Create(
+            [io.file]::ReadAllText($file.fullname)
+        )
+    )
 }
-popd
 
 #
 # Prompt Section

vendor/sources.json

@@ -1,8 +1,8 @@
 [
     {
         "name": "git-for-windows",
-        "version": "v2.10.2.windows.1",
-        "url": "https://github.com/git-for-windows/git/releases/download/v2.10.2.windows.1/PortableGit-2.10.2-32-bit.7z.exe"
+        "version": "v2.11.0.windows.3",
+        "url": "https://github.com/git-for-windows/git/releases/download/v2.11.0.windows.3/PortableGit-2.11.0.3-32-bit.7z.exe"
     },
     {
         "name": "clink",
@@ -11,12 +11,12 @@
     },
     {
         "name": "conemu-maximus5",
-        "version": "161022",
-        "url": "https://github.com/Maximus5/ConEmu/releases/download/v16.10.22/ConEmuPack.161022.7z"
+        "version": "161206",
+        "url": "https://github.com/Maximus5/ConEmu/releases/download/v16.12.06/ConEmuPack.161206.7z"
     },
     {
         "name": "clink-completions",
-        "version": "0.3.1",
-        "url": "https://github.com/vladimir-kotikov/clink-completions/archive/0.3.1.zip"
+        "version": "0.3.2",
+        "url": "https://github.com/vladimir-kotikov/clink-completions/archive/0.3.2.zip"
     }
 ]

vendor/user-aliases.cmd.example

@@ -9,7 +9,7 @@ gl=git log --oneline --all --graph --decorate  $*
 ls=ls --show-control-chars -F --color $*
 pwd=cd
 clear=cls
-history=cat %CMDER_ROOT%\config\.history
+history=cat "%CMDER_ROOT%\config\.history"
 unalias=alias /d $1
 vi=vim $*
 cmderr=cd /d "%CMDER_ROOT%"