Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

User conemu cfg #1109

Merged
merged 6 commits into from
Nov 2, 2016
Merged

User conemu cfg #1109

merged 6 commits into from
Nov 2, 2016

Conversation

daxgames
Copy link
Member

@daxgames daxgames commented Oct 3, 2016

  • Allows user to have a .config/user-conemu.xml file that is not %COMPUTERNAME% specific.
  • Backs up the ./vendor/conemu-maximus5/conemu.xml file if it exist at startup to ./config/ConEmu-%COMPUTERNAME%.xml OR ./config/user-ConEmu.xml if one or the other already exists in that order. If neither exists the backup will default to ./config/user-ConEmu.xml this maintains a portable copy of changes made to this file while using cmder.

@daxgames daxgames force-pushed the user_conemu_cfg branch 5 times, most recently from 3ee64b6 to 838e98f Compare October 3, 2016 03:55
@daxgames
Copy link
Member Author

daxgames commented Oct 4, 2016

I do not like having to have a computer name in my custom config file that I want to be the same on all hosts.

@kodybrown when I added the user-ConEmu.xml check after your computer specific check I removed some code, lines 129-132. I could not see that these lines actually did anything used by the cmder launcher.

Will this break your situation somehow?

@daxgames daxgames force-pushed the user_conemu_cfg branch 3 times, most recently from 4d0e929 to 9cf650f Compare October 4, 2016 14:10
@kodybrown
Copy link
Contributor

You should be fine. Line 129 simply converts Envars to the real path. And, the other lines were to provide a way to get the 'normal' settings file if there wasn't a machine-specific version. Yeah, I think its fine.

@daxgames
Copy link
Member Author

daxgames commented Oct 6, 2016

@kodybrown any comments on my add of backing up of the customized config file? I hated that my ongoing 'conemu.xml' customizations were lost of I deleted the vendor folder for a fresh install.

This is nice since it backs up the continually changing 'conemu.xml' file to a computer named file (if it exists in ./config/) or user file if not at cmder launch.

Only reason I ask is you are the only one who has expressed interest in custom config.

@daxgames
Copy link
Member Author

daxgames commented Oct 9, 2016

Bump. Has anyone on the Cmder core team looked at this?

  • This provides a check for a custom user-ConEmu.xml storage that will serve as a user custom default config for any system '%cmder_root%/config' is copied to for new installs.
    '%cmder_root%/vendor/ConEmu-Maximus5/ConEmu.xml' is maintained as the config file used for all sessions.
  • Possible loss of ongoing changes to '%cmder_root%/vendor/ConEmu-Maximus5/ConEmu.xml' are mitigated by the backup of the last saved settings to the '%cmder_root%/config/' folder .
  • Custom config based on computer name is too specific for most users but some have this use case so it still works.

@MartiUK
Copy link
Member

MartiUK commented Oct 9, 2016

Sorry Dax, I'll look into it more tomorrow.

@daxgames
Copy link
Member Author

daxgames commented Oct 9, 2016

No problem, was just wondering if there were questions.

@MartiUK
Copy link
Member

MartiUK commented Oct 9, 2016

It looks fine after a first glance, will need to check the launcher code more thoroughly.

@daxgames
Copy link
Member Author

daxgames commented Oct 10, 2016

Ok I did compile and test it with Visual Studio Community Edition 2015. It works in all situations but I am no c++ guru so that would be good.

Copy link
Member

@MartiUK MartiUK left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Stanzilla
Copy link
Member

@daxgames the checks here froze for whatever reason, can you push something to re-trigger them?

@MartiUK
Copy link
Member

MartiUK commented Oct 30, 2016

@Stanzilla I've removed the one check that was preventing merges.

@Stanzilla
Copy link
Member

@MartiUK alright, we also need a decision on which branch to use going forward, still dev and master for releases or all master.

@daxgames
Copy link
Member Author

I can push it again as soon as my system comes back up.

@daxgames
Copy link
Member Author

Pushed, hopefully this allows checks to complete.

@daxgames daxgames merged commit 104033e into cmderdev:master Nov 2, 2016
@daxgames daxgames deleted the user_conemu_cfg branch March 7, 2018 22:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants