Commit Graph

985 Commits

Author SHA1 Message Date
Benjamin Staneck 07b426355e ⬆️ Git@2.7.0.windows.2
Changelog: https://github.com/git-for-windows/git/releases/tag/v2.7.0.windows.2
2016-02-03 03:13:43 +01:00
Martin Kemp 261b8bfce3 Merge pull request #794 from JanSchulz/793-clink-settings
Reorganize how clink settings are loaded
2016-02-01 08:45:29 +00:00
Martin Kemp c055ce1c13 Get USER_PROFILE differently
USER_PROFILE is a known folder, so use that functionality to get it.
2016-01-31 21:35:57 +00:00
Jan Schulz fe45b186e0 clink.lua: add header
Introduce a header like in the rest of the scripts that this file
is overwritten on updates and should not be modified.
2016-01-15 18:06:35 +01:00
Jan Schulz 788b5262b4 Reorganize how clink settings are loaded
4bfdf04d59 moved all clink config files
to vendor/ and therefore the files in config/ were not used and .history
was also moved to vendor/.

The new arrangement uses `--script` to load our own clink.lua file which in
turn as the first thing loads the original clink.lua file. The user defined
files are again in config/. As clink regenerates these files, if they are not
present, this also means that we don't need to include the settings file
in the git repo and therefore don't overwrite it on updates.
2016-01-15 18:02:10 +01:00
Martin Kemp 73e1eb2a8b Ensure Environment Variables are propagated. 2016-01-15 13:13:16 +00:00
Martin Kemp fabcd468a7 Use the correct type and initialise it. 2016-01-15 13:01:55 +00:00
Martin Kemp df7a662965 Get the environment variable correctly. 2016-01-15 12:44:10 +00:00
Martin Kemp e7243efce2 Fix build script not exiting on msbuild failure. 2016-01-15 12:28:24 +00:00
Martin Kemp 9c7a037948 Set CMDER_START to USER_PROFILE if no path given. 2016-01-15 12:10:24 +00:00
Martin Kemp 4dc1249881 Set tasks to always user CMDER_START
CMDER_START should always be set as a result of either:
1. The user passes a directory to cmder.exe using `/START $DIR`
- or -
2. Sets CMDER_START as a default environment variable.
Fixes #772
2016-01-15 11:47:54 +00:00
Martin Kemp 5b7c008202 Merge pull request #798 from JanSchulz/cmder_here
Make "cmder here" work again
2016-01-15 11:44:39 +00:00
Benjamin Staneck 724b9a25da ⬆️ Bump clink to 0.4.7 2016-01-15 00:16:18 +01:00
Jan Schulz 2c0c6ed416 Make "cmder here" work again
The new system works by setting "CMDER_START" if a cmder.exe gets a
startup path. The rest is then implemented in the profile.ps1 and init.bat.
The new system works as follows:

1.If a startup path is given, cmder.exe sets this as `CMDER_START` and the
  startup scripts change to that directory.
2.If the usere sets a `CMDER_START` environment variable and this is not
  overwritten by cmder.exe, this variable is taken as the startup
  directory by the startup scripts.
3.If not such path is give, the conemu startup dirs is the winner, as the
  startup scripts don't change anything.
2016-01-11 22:19:10 +01:00
Benjamin Staneck c77641cf03 ⬆️ Git@2.7.0.windows1
Changelog: https://github.com/git-for-windows/git/releases/tag/v2.7.0.windows.1
2016-01-07 01:50:52 +01:00
Benjamin Staneck 378014d5d4 Merge pull request #781 from vladimir-kotikov/patch-3
Bump clink to 0.4.6
2015-12-28 22:50:28 +01:00
Vladimir Kotikov 1389fe0c4d ⬆️ Bump clink to 0.4.6 2015-12-29 00:23:30 +03:00
Dax T. Games 9eb9620966 Fixed som misc stuff and prevented multi runs 2015-12-16 12:37:40 -05:00
Benjamin Staneck add52c0ee6 ⬆️ Git for Windows@2.6.4
Changelog: https://github.com/git-for-windows/git/releases/tag/v2.6.4.windows.1
2015-12-16 06:13:53 +01:00
Martin Kemp 744522b97b Merge pull request #773 from glureau/development
Fix vendor/init.bat when the PATH contains spaces.
2015-12-15 19:09:58 +00:00
Gregory Lureau 6879a94c10 Fix vendor/init.bat when the PATH contains spaces. 2015-12-15 18:56:22 +01:00
Benjamin Staneck 41836e669b ⬆️ ConEmu@151210
Changelog: https://conemu.github.io/blog/2015/12/10/Build-151210.html
Skipped:
* https://conemu.github.io/blog/2015/12/08/Build-151208.html
* https://conemu.github.io/blog/2015/12/07/Build-151207.html
* https://conemu.github.io/blog/2015/12/05/Build-151205.html
* https://conemu.github.io/blog/2015/12/02/Build-151202.html
* https://conemu.github.io/blog/2015/11/29/Build-151129.html
2015-12-11 18:48:47 +01:00
Benjamin Staneck 4a4e48e04c Merge pull request #766 from vladimir-kotikov/patch-2
Bump clink-completions to 0.2.2
2015-12-10 20:56:41 +01:00
Vladimir Kotikov 5f68e4e987 ⬆️ Bump clink-completions to 0.2.2 2015-12-10 22:09:12 +03:00
Benjamin Staneck bdd0f38d59 Merge pull request #746 from daxgames/readme_updates
README.md Updates
2015-12-10 17:54:10 +01:00
Benjamin Staneck 6280416aed Merge pull request #756 from JanSchulz/extra_line_fix
Fix: don't garble the input line for long lines in git projects
2015-12-04 20:35:04 +01:00
Jan Schulz 567889e69f Fix: don't garble the input line for long lines in git projects
If having a long line of input in histroy, which went on into the
second row and using <up> to get back to it, you got the effect
that the input was split over three lines: "text, empty, text",
but using the arrows do move to the front of the first line was
moving the cursor in the second (empty) row. You could change
the text, but you needed to do it "in the dark".  No idea why
s/os.execute/is.popen/ fixes this, but it does.

Partly adresses https://github.com/cmderdev/cmder/issues/749
2015-12-04 19:57:08 +01:00
Martin Kemp 9a1d49bfc3 Merge pull request #427 from kodybrown/development
Added code to check for the existence of a customized ini file..
2015-12-04 13:04:21 +00:00
Martin Kemp 30dbfa6144 Merge pull request #736 from JanSchulz/more_config
More config
2015-12-04 13:04:13 +00:00
Dax T. Games 73f5cbdc7b README.md Updates 2015-11-28 11:12:25 -06:00
Benjamin Staneck d0909f27e1 ⬆️ ConEmu@151129
Changelog: http://conemu.github.io/blog/2015/11/26/Build-151126.html
Skipped http://conemu.github.io/blog/2015/11/22/Build-151122.html
2015-11-28 02:45:05 +01:00
Dax T. Games b88ea50aef Added vendor/cmder_exinit. Allows integrating externally installed Msys/Msys2/Cygwin into Cmder 2015-11-26 09:32:10 -06:00
Dax T. Games 46bad57ef8 Added config/aliases to .gitignore to account for recent changes in dev branch 2015-11-26 09:27:32 -06:00
Martin Kemp 3595d3e7fc Merge pull request #737 from JanSchulz/user-profile
Use consistent naming: user-profile.{sh|bat|ps1}
2015-11-25 10:01:18 +00:00
Martin Kemp 05c6f1c9cc Merge pull request #738 from daxgames/packignore_updates
added config\user-* to packignore
2015-11-25 10:00:12 +00:00
Martin Kemp 182d0c15a3 Merge pull request #731 from daxgames/fix_icons
Fix icons
2015-11-25 09:59:59 +00:00
Dax T. Games 867910ac9e added config\user-* to packignore 2015-11-24 19:08:58 -06:00
Dax T. Games 630ac0c571 reverted last change, removed config/user-* from packignore 2015-11-24 19:03:46 -06:00
Jan Schulz 105e381e66 Document the files in config 2015-11-25 00:31:17 +01:00
Jan Schulz 854cadb185 Use consistent naming: user-profile.{sh|bat|ps1} 2015-11-25 00:23:04 +01:00
Jan Schulz 4bfdf04d59 Do not overwrite cmder.lua on update 2015-11-25 00:14:35 +01:00
Martin Kemp c9550490f5 Merge pull request #735 from JanSchulz/config_aliases
Do not overwrite aliases on update
2015-11-24 22:54:49 +00:00
Martin Kemp 85804d729e Merge pull request #734 from chase-miller/development
Added check for git install path in init.bat.
2015-11-24 22:43:15 +00:00
Jan Schulz 4154cdf204 Do not overwrite aliases on update 2015-11-24 23:38:26 +01:00
Chase Miller 76e14cd268 Added check for %USERPROFILE%\AppData\Local\Programs\Git path in init.bat. Installing from https://git-scm.com/download/win seems to put git in this directory. 2015-11-24 17:26:41 -05:00
Dax T. Games 8601b0f940 added config/user-* to packignore 2015-11-24 16:06:39 -06:00
Dax T. Games ce2a311c81 Merge branch 'development' of https://github.com/cmderdev/cmder into fix_icons 2015-11-24 14:54:40 -06:00
Dax T. Games 191316282a Get 100% supported Cmder task icons from icons\Cmder.ico so tabs have an ico if launched from the cmder.bat file 2015-11-24 14:52:13 -06:00
Dax T. Games fd9c8a74b1 Added Git for Windows icon to mintty tasks to differentiate them from 100% supported Cmder tasks 2015-11-24 14:45:52 -06:00
Benjamin Staneck 519b9cabbb Merge pull request #729 from daxgames/fix_vim_alias
Fixed - Powershell vim/vim alias opening a new tab when editing a file
2015-11-24 18:21:03 +01:00