New cmder.exe args and shared install capability #1696

daxgames · 2018-03-07T22:40:19Z

1.3.6-pre1 (2018-03-01)

The is a redo of #1665 - See the conversation there if you have questions.

Fixed bugs:

Fixed Git version check recently added to master.

Updates:

Modified Cmder tasks in default Conemu.xml to allow easily adding command line args for init.bat by adding some quotes. This resulted in a ton of misc changes to this file. See Adds below.
Reworked cmder.exe command line argument handling to make it more flexible and easily added to.
Reworked README.md tables to make them more readable in editors

Implemented enhancements:

Append %GIT_INSTALL_ROOT%\mingw32|64 folder to the path if it exists. Thanks: @gucong3000
Added cmder.exe command line args documenttion to README.md
Added :enhance_path method to vendor\init.bat that modifies the path only if required.
- To prepend: call :enhance_path "%cmder_root%"
- to append: call :enhance_path "%cmder_root%" append
Added :enhance_path_recursive method to vendor\init.bat that adds a path and all its sub directories to the path if required.
- Max recurse depth default is '1' configurable using init.bat /max_depth [1-5]. 6+ results in error.
- To prepend and go 3 levels deep: call :enhance_path "%cmder_root%" 3
- To append and go 2 levels deep: call :enhance_path "%cmder_root%" 2 append
Added ability to init.bat to accept command line args and documented them in README.md. Allows users to change the behaviour of init.bat without editing the file.

Argument	Description	Default
/c [user cmder root]	Enables user bin and config folders for 'Cmder as admin' sessions due to non-shared environment.	not set
/d	Enables debug output.	not set
/git_install_root [file path]	User specified Git installation root path.	'%CMDER_ROOT%\vendor\Git-for-Windows'
/home [home folder]	User specified folder path to set `%HOME%` environment variable.	'%userprofile%'
/max_depth [1-5]	Define max recurse depth when adding to the path for `%cmder_root%\bin` and `%cmder_user_bin%`	1
/svn_ssh [path to ssh.exe]	Define %SVN_SSH% so we can use git svn with ssh svn repositories.	'%GIT_INSTALL_ROOT%\bin\ssh.exe'
/user_aliases [file path]	File path pointing to user aliases.	'%CMDER_ROOT%\config\user-liases.cmd'
/v	Enables verbose output.	not set

Added new cmder.exe /C \<path\> argument
- To use run Cmder.exe with "/C" command line argument. Example: cmder.exe /C %userprofile%\cmder_config
- To use run with Cmder as Admin sessions you must specify "/c" command line argument to init.bat in tasks. See README.md for details.
- Enables shared Cmder install with Non-Portable Individual User Config
- Supported by all supported shells (cmder, powershell, git bash, and external bash)
- This will create the following directory structure if it is missing.
```
c:\users\[username]\cmder_config
├───bin
└───config
    └───profile.d
```
- Shell init scripts run in the following order
  1. %cmder_root%\config\profile.d*.[cmd|ps1|sh]
  2. %cmder_root%\config\user-profile.[cmd|ps1|sh]
  3. %userprofile%\cmder_config\config\profile.d*.[cmd|ps1|sh]
  4. %userprofile%\cmder_config\config\user-profile.[cmd|ps1|sh]

…l user config location

… an init.bat launch

@DRSDavidSoft

…roperly. Thanks @DRSDavidSoft

cmderdev#1624

…nce the env is not shared.

daxgames · 2018-03-07T22:45:09Z

@cmderdev/trusted-contributors @DRSDavidSoft - This is a new PR based on #1665 because I screwed that branch up somehow trying to rebase for @Stanzilla. Please test the Nightly build of this commit.

DRSDavidSoft · 2018-03-08T03:37:03Z

Subscribed again!

MartiUK

I cannot confirm that %userprofile%\cmder_config is created on first run in my test.

MartiUK · 2018-03-08T11:17:49Z

launcher/src/CmderLauncher.cpp

+	int argCount;
+
+	szArgList = CommandLineToArgvW(GetCommandLine(), &argCount);
+	/*


Any reason why these lines are left in commented out?

MartiUK · 2018-03-08T11:17:49Z

launcher/src/CmderLauncher.cpp

+				MessageBox(NULL, L"Unrecognized parameter.\n\nValid options:\n\n    /c [CMDER User Root Path]\n\n    /task [ConEmu Task Name]\n\n    [/start [Start in Path] | [Start in Path]]\n\n    /single\n\nor\n\n    /register [USER | ALL]\n\nor\n\n    /unregister [USER | ALL]\n", MB_TITLE, MB_OK);
+				cmderOptions.error = true;
+			}
+		//}


Commented out brace?

MartiUK · 2018-03-08T11:17:49Z

launcher/src/CmderLauncher.cpp

 	}
-
+	


Unintentional whitespace here

MartiUK · 2018-03-08T11:21:10Z

@daxgames Ignore me, I didn't specify %userprofile%\cmder_config when running with /C, should there be a default location?

daxgames · 2018-03-08T12:20:50Z

@MartiUK I could clean those comments and whitespace up and add a default for. /c. I thought about that after it was done but just wanted it to be done.

Stanzilla · 2018-03-09T06:52:02Z

Yeah a default is needed, bit confusing otherwise, could also make it error if nothing gets specified?

MartiUK · 2018-03-09T10:22:35Z

@Stanzilla @daxgames Well, at the moment cmder does not start at all when running with /C but without an argument.

Stanzilla · 2018-03-09T10:42:48Z

yeah, that should throw an error, imo. I hate it when stuff silently dies and I have no idea why (Hint UWP apps HINT)

Comments and whites pace cleaned up and default for /c is %userprofile%\cmder_cfg if the next arg is NULL or not an arg beginning in /

DRSDavidSoft · 2018-03-10T20:46:01Z

@daxgames I can rewrite the C++ argument parsing logic similar to what I did here in my project.

daxgames · 2018-03-10T20:55:55Z

@cmderdev/trusted-contributors, @DRSDavidSoft It's done. Comments and whites space is cleaned up and default for /c is %userprofile%\cmder_cfg if the next arg either is NULL or not an arg beginning in /

There may be a better way to do it but this works.

I also found that the handling and backup of the ConEmu.xml config was not working properly and fixed that. No idea how long its been broken.

The following now work in this order:

If `%cmder_root%\config\conemu-%computername%.xml` exists

If Vendored conemu.xml exists:
- %cmder_root\vendor\conemu-maximus5\ConEmu.xml is copied to %cmder_root%\config\conemu-%computername%.xml to backup any previous session config changes.
else:
- %cmder_root%\config\conemu-%computername%.xml is copied to %cmder_root\vendor\conemu-maximus5\ConEmu.xml

Else If `%cmder_root%\config\user-conemu.xml` exists

If Vendored conemu.xml exists:
- %cmder_root\vendor\conemu-maximus5\ConEmu.xml is copied to %cmder_root%\config\user-conemu.xml to backup any previous session config changes.
Else:
- %cmder_root%\config\user-conemu.xml is copied to %cmder_root\vendor\conemu-maximus5\ConEmu.xml

Else If Vendored conemu.xml exists:

Vendored %cmder_root%\config\conemu.xml is copied to %cmder_root\config\user-ConEmu.xml

Else:

Default %cmder_root%\config\conemu.xml is copied to %cmder_root\vendor\conemu-maximus5\ConEmu.xml

… arg is not another arg

Stanzilla · 2018-03-13T10:30:20Z

Really happy with this so far 👍

MartiUK · 2018-03-13T11:07:06Z

Yeah this looks good to me, is there nothing else to add @daxgames?

DRSDavidSoft

Looks good to me!

Stanzilla · 2018-03-13T16:35:16Z

Grats on shipping! Also have fun with closing all the issues that are now fixed :)

@MartiUK

@MartiUK: Squashing to avoid adding multiple "fixed" commits * add args to init.bat * adding args to cmder launcher * reworked command line parsing and added a /C [path] arg for individual user config location * removed unnecessary includes * make shell init scripts work with CMDER_USER_CONFIG * update tasks and readme.md * fix git version check * readme updates * add register/unregister back in * fixed git version again * removed error if user defines user-aliases store file was not present an init.bat launch * added enhance_path method to only update path if required * added enhance_path method to only update path if required * fixed a path prepend issue in enhance path * init.bat with args is executed outside cmder/conemu sets cmder_root properly. Thanks @DRSDavidSoft * fixed enhance path append issue * implements recursive `/bin` path enhancing. cmderdev#1624 * added max depth * changes command line arg to max_depth * set max_depth default * readme.md updates * add back cmder /c [path] arg so it can be used with admin sessions since the env is not shared. * readme.md updates * fix /c setting of cmder_user_config * changelog and readme * remove bad arg * fixed command line parsing and updated command line help on error * Fixed ConEmu.xml file handling so it works again * Added default user config root location if '/c' is specified and next arg is not another arg

wireddown · 2020-01-15T20:45:29Z

For users that need to run user_profile.ps1 and friends in profile.d for Administrator sessions in Powershell, you cannot use /c [user cmder root] because Powershell sessions aren't created from init.bat, but instead by

*PowerShell -ExecutionPolicy Bypass -NoLogo -NoProfile -NoExit -Command "Invoke-Expression 'Import-Module ''%ConEmuDir%\..\profile.ps1'''"

and ''%ConEmuDir%\..\profile.ps1'' doesn't accept any command line arguments.

Instead, on the Environment panel, set these two variables to match your configuration:

set CMDER_USER_BIN=C:\full\path\to\your\cmder\bin
set CMDER_USER_CONFIG=C:\full\path\to\your\cmder\config

and new Powershell as Admin sessions will use your user_profile.ps1 script.

daxgames and others added 26 commits March 7, 2018 16:24

add args to init.bat

202a778

adding args to cmder launcher

078822b

reworked command line parsing and added a /C [path] arg for individua…

75d1243

…l user config location

removed unnecessary includes

4f59655

make shell init scripts work with CMDER_USER_CONFIG

433292a

update tasks and readme.md

dbb80c8

fix git version check

2f79d2d

readme updates

14eb7b2

add register/unregister back in

3ad5b58

fixed git version again

1e095e7

removed error if user defines user-aliases store file was not present…

ed1f5e2

… an init.bat launch

added enhance_path method to only update path if required

6afddc8

added enhance_path method to only update path if required

799c565

fixed a path prepend issue in enhance path

e359edd

init.bat with args is executed outside cmder/conemu sets cmder_root p…

baf719e

…roperly. Thanks @DRSDavidSoft

fixed enhance path append issue

d1341aa

implements recursive /bin path enhancing.

b8c6eba

cmderdev#1624

added max depth

649570f

changes command line arg to max_depth

ba692c7

set max_depth default

d20a406

readme.md updates

137664d

add back cmder /c [path] arg so it can be used with admin sessions si…

80a3cff

…nce the env is not shared.

readme.md updates

fb32e74

fix /c setting of cmder_user_config

1f888a6

changelog and readme

84465a2

remove bad arg

00d8485

daxgames force-pushed the init_args_rebased branch 2 times, most recently from 4ad32c0 to bf014df Compare March 7, 2018 23:08

fixed command line parsing and updated command line help on error

10fe9c6

MartiUK self-requested a review March 8, 2018 09:45

MartiUK previously requested changes Mar 8, 2018

View changes

Fixed ConEmu.xml file handling so it works again

5a16de4

Added default user config root location if '/c' is specified and next…

a221702

… arg is not another arg

daxgames force-pushed the init_args_rebased branch from 60dd70a to a221702 Compare March 10, 2018 22:49

daxgames closed this Mar 11, 2018

daxgames reopened this Mar 11, 2018

daxgames mentioned this pull request Mar 12, 2018

Found old git but not using... #1703

Closed

DRSDavidSoft mentioned this pull request Mar 13, 2018

init.bat – Invalid method used for determining a recent git version #1564

Closed

DRSDavidSoft approved these changes Mar 13, 2018

View changes

MartiUK approved these changes Mar 13, 2018

View changes

Stanzilla self-requested a review March 13, 2018 15:36

Stanzilla approved these changes Mar 13, 2018

View changes

MartiUK merged commit 997e799 into cmderdev:master Mar 13, 2018

daxgames deleted the init_args_rebased branch March 24, 2018 13:56

daxgames mentioned this pull request Nov 13, 2018

Use user_conemu.xml or conemu-%computername%.xml directly if '-c [path]' is used to start cmder. #1949

Merged

New cmder.exe args and shared install capability #1696

New cmder.exe args and shared install capability #1696

daxgames commented Mar 7, 2018

daxgames commented Mar 7, 2018 •

edited

DRSDavidSoft commented Mar 8, 2018

MartiUK left a comment

MartiUK Mar 8, 2018

daxgames Mar 10, 2018

MartiUK Mar 8, 2018

daxgames Mar 10, 2018

MartiUK Mar 8, 2018

daxgames Mar 10, 2018

MartiUK commented Mar 8, 2018

daxgames commented Mar 8, 2018

Stanzilla commented Mar 9, 2018

MartiUK commented Mar 9, 2018

Stanzilla commented Mar 9, 2018

DRSDavidSoft commented Mar 10, 2018

daxgames commented Mar 10, 2018 •

edited

Stanzilla commented Mar 13, 2018

MartiUK commented Mar 13, 2018

DRSDavidSoft left a comment

Stanzilla commented Mar 13, 2018

wireddown commented Jan 15, 2020

New cmder.exe args and shared install capability #1696

New cmder.exe args and shared install capability #1696

Conversation

daxgames commented Mar 7, 2018

1.3.6-pre1 (2018-03-01)

daxgames commented Mar 7, 2018 • edited

DRSDavidSoft commented Mar 8, 2018

MartiUK left a comment

Choose a reason for hiding this comment

MartiUK Mar 8, 2018

Choose a reason for hiding this comment

daxgames Mar 10, 2018

Choose a reason for hiding this comment

MartiUK Mar 8, 2018

Choose a reason for hiding this comment

daxgames Mar 10, 2018

Choose a reason for hiding this comment

MartiUK Mar 8, 2018

Choose a reason for hiding this comment

daxgames Mar 10, 2018

Choose a reason for hiding this comment

MartiUK commented Mar 8, 2018

daxgames commented Mar 8, 2018

Stanzilla commented Mar 9, 2018

MartiUK commented Mar 9, 2018

Stanzilla commented Mar 9, 2018

DRSDavidSoft commented Mar 10, 2018

daxgames commented Mar 10, 2018 • edited

If %cmder_root%\config\conemu-%computername%.xml exists

Else If %cmder_root%\config\user-conemu.xml exists

Else If Vendored conemu.xml exists:

Else:

Stanzilla commented Mar 13, 2018

MartiUK commented Mar 13, 2018

DRSDavidSoft left a comment

Choose a reason for hiding this comment

Stanzilla commented Mar 13, 2018

wireddown commented Jan 15, 2020

daxgames commented Mar 7, 2018 •

edited

daxgames commented Mar 10, 2018 •

edited

If `%cmder_root%\config\conemu-%computername%.xml` exists

Else If `%cmder_root%\config\user-conemu.xml` exists