Compare commits

..

10 Commits

Author SHA1 Message Date
832c1991e4 Merge pull request #1070 from janschulz/unicode_path_prompt
Parse the original prompt for cwd and env names
2016-08-15 16:40:35 +02:00
19672aafff ⬆️ Update Git to v2.9.2
Release notes: https://github.com/git-for-windows/git/tree/v2.9.3.windows.1
2016-08-14 04:59:27 +02:00
6b10771312 Parse the original prompt for cwd and env names
clink.get_cwd() is returning a string which is differently encoded than what
clink.prompt.value expects. This results in garbled path names if the path
condains non-ASCII chars. The (arguable hacky) solution is to parse the old
prompt for the current directory (which breaks if the user sets a PROMPT env var
which is incompatible to the regex used here...).

Also parse out a environment name set by systems like virtualenv or conda: this
could be done more specifically by targeting each such system and using the
usually set environment variable but this would mean that we would have to do
that for each and every such system out there and that is probably not a sane
idea...
2016-08-09 13:45:36 +02:00
13fd41eb82 change how we ask hg for the status
closes #1035
Thanks @raleighr3
2016-07-30 00:36:32 +02:00
07fb26c4a5 Merge pull request #1042 from daxgames/kill_ssh_agent
Added kill ssh-agent to build.ps1
2016-07-18 01:47:45 +02:00
13c474b768 added kill ssh-agent to build.ps1 2016-07-17 18:28:38 -05:00
f2641e4cd2 ⬆️ Update Git to v2.9.2 2016-07-17 01:09:06 +02:00
6a0ea28d22 add .github_changelog_generator to .gitignore 2016-07-14 10:51:01 +02:00
04c7bb7da8 update changelog 2016-07-14 09:52:27 +02:00
317834316a add hashes.txt to artifacts 2016-07-14 09:28:13 +02:00
7 changed files with 174 additions and 9 deletions

1
.gitignore vendored
View File

@ -15,3 +15,4 @@ Version v*
config/user-*
config/aliases
config/profile.d
.github_changelog_generator

View File

@ -1,4 +1,130 @@
# Change Log
# Change Log
## [v1.3.0](https://github.com/cmderdev/cmder/tree/v1.3.0) (2016-07-14)
[Full Changelog](https://github.com/cmderdev/cmder/compare/v1.3.0-pre...v1.3.0)
**Closed issues:**
- Cmder getting raped by dr.web quarantine system [\#1031](https://github.com/cmderdev/cmder/issues/1031)
- Can I switch vim in cmder to gvim installed by myself? [\#1021](https://github.com/cmderdev/cmder/issues/1021)
- \[Windows10 Bash\] Could use UP/Down/Home/End....key in cmder [\#1017](https://github.com/cmderdev/cmder/issues/1017)
- {lamb} problem again... :-\( [\#1012](https://github.com/cmderdev/cmder/issues/1012)
- High-lighting text and copying is broken [\#1008](https://github.com/cmderdev/cmder/issues/1008)
- issue with updating ConEmuPack.160619.7z [\#1006](https://github.com/cmderdev/cmder/issues/1006)
- after updating cmder [\#1004](https://github.com/cmderdev/cmder/issues/1004)
- using touch in cli doesn't work anymore with latest update [\#1002](https://github.com/cmderdev/cmder/issues/1002)
- v1.3.0-pre doesn't support running inside program files folder [\#998](https://github.com/cmderdev/cmder/issues/998)
- Text cursor disappears when window resized [\#997](https://github.com/cmderdev/cmder/issues/997)
- how to use clip command in the cmder? [\#996](https://github.com/cmderdev/cmder/issues/996)
- {git}{hg} appearing in path print out rather than the values they represent [\#995](https://github.com/cmderdev/cmder/issues/995)
- Don't just prepend the git path. [\#994](https://github.com/cmderdev/cmder/issues/994)
- Attempt to concatenate local 'package\_version' \(a nil value\) [\#991](https://github.com/cmderdev/cmder/issues/991)
- After auto-update git/hg indication and lambda in prompt are broken [\#990](https://github.com/cmderdev/cmder/issues/990)
- Lack of Proxy Setting [\#989](https://github.com/cmderdev/cmder/issues/989)
- Clink completion failing [\#987](https://github.com/cmderdev/cmder/issues/987)
- \ [\#986](https://github.com/cmderdev/cmder/issues/986)
- Is It Possible to recover the files removed by `rm -rf` [\#979](https://github.com/cmderdev/cmder/issues/979)
- . [\#973](https://github.com/cmderdev/cmder/issues/973)
- right click context menu open cmd without color [\#972](https://github.com/cmderdev/cmder/issues/972)
- git branch name is not red when there are pending changes [\#967](https://github.com/cmderdev/cmder/issues/967)
- git checkout autocomplete is showing files [\#966](https://github.com/cmderdev/cmder/issues/966)
- Cmder proxy Ubuntu Bash on Windows [\#964](https://github.com/cmderdev/cmder/issues/964)
- Update version on Chocolatey [\#959](https://github.com/cmderdev/cmder/issues/959)
- ConEmu Injecting hooks fail [\#958](https://github.com/cmderdev/cmder/issues/958)
- cmder \(from cmder\_mini.zip\) crashes on startup on windows 7 pro x64 [\#955](https://github.com/cmderdev/cmder/issues/955)
- Feature: add some extra prompt-tuning hooks to profile.ps1 from user-profile.ps1 [\#950](https://github.com/cmderdev/cmder/issues/950)
- Provide alternate icon colors [\#947](https://github.com/cmderdev/cmder/issues/947)
- "\cmder\config\settings was unexpected at this time" and {lamb} is shown instead of lambda symbol [\#937](https://github.com/cmderdev/cmder/issues/937)
- Cannot save settings [\#936](https://github.com/cmderdev/cmder/issues/936)
- init.bat fails and shows {lamb} and {git} [\#935](https://github.com/cmderdev/cmder/issues/935)
- Cmder minimizing when losing focus. [\#934](https://github.com/cmderdev/cmder/issues/934)
- init.bat always uses "npm" as window title [\#933](https://github.com/cmderdev/cmder/issues/933)
- `ls` return vertical list instead of horizontal? [\#924](https://github.com/cmderdev/cmder/issues/924)
- Arrow keys do not work with bash \(Win10/Linux Subsystem\) [\#914](https://github.com/cmderdev/cmder/issues/914)
- Aliased commands: Syntax Highlighting Lost [\#912](https://github.com/cmderdev/cmder/issues/912)
- 'vim' hangs when loading in cmder bash session [\#910](https://github.com/cmderdev/cmder/issues/910)
- Unix commands not working in windows 10 [\#908](https://github.com/cmderdev/cmder/issues/908)
- git 2.8 ? [\#905](https://github.com/cmderdev/cmder/issues/905)
- Confusing "Settings" \> "Integration" dialog behavior [\#904](https://github.com/cmderdev/cmder/issues/904)
- v1.3.0 antivirus [\#903](https://github.com/cmderdev/cmder/issues/903)
- Feature Request: Send to all/group [\#896](https://github.com/cmderdev/cmder/issues/896)
- Updating git-for-windows after installing the full cmder? [\#887](https://github.com/cmderdev/cmder/issues/887)
- Enconding ? [\#877](https://github.com/cmderdev/cmder/issues/877)
- the {cmd} task [\#876](https://github.com/cmderdev/cmder/issues/876)
- Failed to start cmder, app crashed [\#871](https://github.com/cmderdev/cmder/issues/871)
- Having trouble with packaged conemu install, how can I point to a different one? [\#858](https://github.com/cmderdev/cmder/issues/858)
- path entry for \<git\>/cmd instead of \<git\>/bin? [\#853](https://github.com/cmderdev/cmder/issues/853)
- Cmder lists path on window resize. [\#851](https://github.com/cmderdev/cmder/issues/851)
- cmder and vim compatibility problem [\#846](https://github.com/cmderdev/cmder/issues/846)
- Unable to git pull,push or any action [\#845](https://github.com/cmderdev/cmder/issues/845)
- Missing git support, install posth-git [\#834](https://github.com/cmderdev/cmder/issues/834)
- "-ExecutionPolicy' is not recognized as an internal or external command" [\#830](https://github.com/cmderdev/cmder/issues/830)
- How to upgrade from v1.1.4.1 to v1.2 ? [\#825](https://github.com/cmderdev/cmder/issues/825)
- Startup warning [\#821](https://github.com/cmderdev/cmder/issues/821)
- Cmder prompt screwed up with latest Windows 10 Build [\#820](https://github.com/cmderdev/cmder/issues/820)
- Installer for cmder? [\#812](https://github.com/cmderdev/cmder/issues/812)
- Netcat is missing [\#810](https://github.com/cmderdev/cmder/issues/810)
- Cmder - Warning: Missing git support [\#806](https://github.com/cmderdev/cmder/issues/806)
- Branch name not visible and vagrant commands not working [\#778](https://github.com/cmderdev/cmder/issues/778)
- Run command to start [\#775](https://github.com/cmderdev/cmder/issues/775)
- Security Warning - cmder\vendor\profile.ps1 [\#767](https://github.com/cmderdev/cmder/issues/767)
- v1.2.9中文路径乱码 [\#764](https://github.com/cmderdev/cmder/issues/764)
- How do confirm exe's are safe? md5? checksum? [\#761](https://github.com/cmderdev/cmder/issues/761)
- Prevent other apps from overwriting the prompt? [\#749](https://github.com/cmderdev/cmder/issues/749)
- Sublime Integration fails - Can't find "C:\Programs"? [\#727](https://github.com/cmderdev/cmder/issues/727)
- Use tab to cycle through auto complete, like the original cmd does? [\#681](https://github.com/cmderdev/cmder/issues/681)
- Emoji support [\#642](https://github.com/cmderdev/cmder/issues/642)
- Strange Vim behaviour after Git for Windows upgrade [\#628](https://github.com/cmderdev/cmder/issues/628)
- Invoking ConEmu instead of ConEmu64 on Windows 10 64-bit [\#574](https://github.com/cmderdev/cmder/issues/574)
- Using .bashrc [\#565](https://github.com/cmderdev/cmder/issues/565)
- Git checks for 'commits' every time a folder is changed? [\#529](https://github.com/cmderdev/cmder/issues/529)
- Powershell tab title issue [\#528](https://github.com/cmderdev/cmder/issues/528)
- storage in userprofile \(instead of fixed config dir relative to the executable\) [\#526](https://github.com/cmderdev/cmder/issues/526)
- ncurses borders incorrectly displayed with ssh.exe [\#499](https://github.com/cmderdev/cmder/issues/499)
- git-p4.py \[Errno 2\] No such file or directory [\#392](https://github.com/cmderdev/cmder/issues/392)
- ConEmu auto attach with Cmder aliases [\#388](https://github.com/cmderdev/cmder/issues/388)
- Using the context menu doesn't open a new tab in Single Instance Mode [\#356](https://github.com/cmderdev/cmder/issues/356)
- Integrate PSReadLine [\#301](https://github.com/cmderdev/cmder/issues/301)
- Moved Documents folder, running "ls" gives "ls: My Documents: No such file or directory" [\#284](https://github.com/cmderdev/cmder/issues/284)
- bug when using up and down key [\#264](https://github.com/cmderdev/cmder/issues/264)
- ps scripts: support space in foldernames [\#261](https://github.com/cmderdev/cmder/issues/261)
- Accented characters [\#234](https://github.com/cmderdev/cmder/issues/234)
- color scheme lost after CTRL+C on git status [\#227](https://github.com/cmderdev/cmder/issues/227)
- CJK problem [\#222](https://github.com/cmderdev/cmder/issues/222)
- Launcher opens new window separately [\#217](https://github.com/cmderdev/cmder/issues/217)
- Theme not applied on Run command prompt here [\#216](https://github.com/cmderdev/cmder/issues/216)
- "Your alias cannot contain a space" [\#214](https://github.com/cmderdev/cmder/issues/214)
- Blank line [\#205](https://github.com/cmderdev/cmder/issues/205)
- Open cmder as Tab from the file explorer [\#197](https://github.com/cmderdev/cmder/issues/197)
- Git Not working [\#192](https://github.com/cmderdev/cmder/issues/192)
- Add hotkey to switch tabs [\#186](https://github.com/cmderdev/cmder/issues/186)
- Child shells yields broken prompt [\#178](https://github.com/cmderdev/cmder/issues/178)
- generation of Pipe symbol not possible [\#168](https://github.com/cmderdev/cmder/issues/168)
- Moving files with ../ [\#158](https://github.com/cmderdev/cmder/issues/158)
- attach to GUI was requested, but there is no console processes! [\#150](https://github.com/cmderdev/cmder/issues/150)
- Create windows installer [\#142](https://github.com/cmderdev/cmder/issues/142)
**Merged pull requests:**
- Development [\#1037](https://github.com/cmderdev/cmder/pull/1037) ([Stanzilla](https://github.com/Stanzilla))
- Minor update in README.md [\#1016](https://github.com/cmderdev/cmder/pull/1016) ([Mansuro](https://github.com/Mansuro))
- Added rainbow icons [\#1014](https://github.com/cmderdev/cmder/pull/1014) ([JoshuaKGoldberg](https://github.com/JoshuaKGoldberg))
- Fix git branch colouring [\#1011](https://github.com/cmderdev/cmder/pull/1011) ([MoFo88](https://github.com/MoFo88))
- Bump clink-completions to 0.3.1 [\#992](https://github.com/cmderdev/cmder/pull/992) ([vladimir-kotikov](https://github.com/vladimir-kotikov))
- Fix git branch name never shown as dirty [\#974](https://github.com/cmderdev/cmder/pull/974) ([janschulz](https://github.com/janschulz))
- Register cmder in the context menu from powershell [\#962](https://github.com/cmderdev/cmder/pull/962) ([Jackbennett](https://github.com/Jackbennett))
- cmd: change the prompt in lua [\#961](https://github.com/cmderdev/cmder/pull/961) ([janschulz](https://github.com/janschulz))
- Update clink-completions to 0.3.0 [\#946](https://github.com/cmderdev/cmder/pull/946) ([vladimir-kotikov](https://github.com/vladimir-kotikov))
- Added :verbose-output subroutine, made aliases update more functional [\#945](https://github.com/cmderdev/cmder/pull/945) ([daxgames](https://github.com/daxgames))
- fixed git not working in cmder cmd session and added some comments [\#943](https://github.com/cmderdev/cmder/pull/943) ([daxgames](https://github.com/daxgames))
- More variable quoting in init.bat [\#941](https://github.com/cmderdev/cmder/pull/941) ([janschulz](https://github.com/janschulz))
- Add quotes around all variables [\#940](https://github.com/cmderdev/cmder/pull/940) ([janschulz](https://github.com/janschulz))
- Fix missing "\" when building dirpath to psmodules [\#916](https://github.com/cmderdev/cmder/pull/916) ([liftir](https://github.com/liftir))
- upgraded git to 2.8.1 [\#911](https://github.com/cmderdev/cmder/pull/911) ([daxgames](https://github.com/daxgames))
- Added proxy support [\#909](https://github.com/cmderdev/cmder/pull/909) ([daxgames](https://github.com/daxgames))
- fixed - not running user-aliases.cmd if aliases variable is overridde… [\#892](https://github.com/cmderdev/cmder/pull/892) ([daxgames](https://github.com/daxgames))
- better git path handling [\#865](https://github.com/cmderdev/cmder/pull/865) ([janschulz](https://github.com/janschulz))
- Enhanced alias.bat to allow file storage path [\#862](https://github.com/cmderdev/cmder/pull/862) ([daxgames](https://github.com/daxgames))
## [v1.3.0-pre](https://github.com/cmderdev/cmder/tree/v1.3.0-pre) (2016-03-20)
[Full Changelog](https://github.com/cmderdev/cmder/compare/v1.2.9...v1.3.0-pre)

View File

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

View File

@ -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)"

View File

@ -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"

34
vendor/clink.lua vendored
View File

@ -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

4
vendor/sources.json vendored
View File

@ -1,8 +1,8 @@
[
{
"name": "git-for-windows",
"version": "v2.9.0.windows.1",
"url": "https://github.com/git-for-windows/git/releases/download/v2.9.0.windows.1/PortableGit-2.9.0-32-bit.7z.exe"
"version": "v2.9.3.windows.1",
"url": "https://github.com/git-for-windows/git/releases/download/v2.9.3.windows.1/PortableGit-2.9.3-32-bit.7z.exe"
},
{
"name": "clink",