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

FEAT(client): Allow specifying config file via commandline switch #4369

Merged
merged 2 commits into from Aug 4, 2020
Merged

FEAT(client): Allow specifying config file via commandline switch #4369

merged 2 commits into from Aug 4, 2020

Conversation

Popkornium18
Copy link
Contributor

This adds the switch -c/--config to the mumble client. If -c is followed by a filename, this file will be read instead of the standard config.
A new config option database= has been added to the 'General' section of the ini file. This can be used to specify a different database which is necessary to run multiple completely separate Mumble instances at the same time.

Additionaly the (undocumented) function to merge another ini file by providing it as a parameter has been removed as it was conflicting with the added functionality.

FIXES #3953

src/mumble/main.cpp Outdated Show resolved Hide resolved
@Popkornium18
Copy link
Contributor Author

Popkornium18 commented Jul 16, 2020

I'd like to add some documentation for this to the man page. Since there are already a lot of other commandline arguments that are not documented in the man page, I thought this would be another PR. Or is there a reason why they are not mentioned in the man page?

@Krzmbrzl
Copy link
Member

We have a man-page? 😅

Updating the man page does indeed sound like a good candidate for another PR 👍

src/mumble/Database.cpp Show resolved Hide resolved
src/mumble/Database.h Show resolved Hide resolved
src/mumble/MainWindow.cpp Outdated Show resolved Hide resolved
src/mumble/Settings.cpp Outdated Show resolved Hide resolved
src/mumble/main.cpp Outdated Show resolved Hide resolved
@Popkornium18
Copy link
Contributor Author

I made all the changes you requested.

src/mumble/Database.cpp Show resolved Hide resolved
src/mumble/Database.cpp Outdated Show resolved Hide resolved
src/mumble/Database.cpp Show resolved Hide resolved
src/mumble/main.cpp Outdated Show resolved Hide resolved
This adds the switch -c/--config to the mumble client. If -c is
followed by a filename, this file will be read instead of the
standard config. A new config option database= has been added to
the 'General' section of the ini file. This can be used to specify
a different database which is necessary to run multiple completely
separate Mumble instances at the same time.

Additionaly the (undocumented) function to merge another ini file
by providing it as a parameter has been removed as it was
conflicting with the added functionality.

FIXES #3953
Updating 'mumble_en.ts'...
    Found 1891 source text(s) (4 new and 1887 already existing)
    Removed 2 obsolete entries
@Krzmbrzl Krzmbrzl merged commit a4f7896 into mumble-voip:master Aug 4, 2020
@Krzmbrzl
Copy link
Member

Krzmbrzl commented Aug 4, 2020

Thank you for your work! :)

@Popkornium18 Popkornium18 deleted the configswitch branch August 4, 2020 22:09
@zBeeble42
Copy link

is this in 1.3.3?

@Krzmbrzl
Copy link
Member

No. As this is a new feature, it will not get backported. That means that it'll be part of 1.4.0 ☝️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Allow alternative configuration files for client
3 participants