Add support for portable config settings#645
Merged
Conversation
632472a to
7e76e2f
Compare
phoerious
approved these changes
Jun 15, 2017
louib
reviewed
Jun 18, 2017
src/core/Config.cpp
Outdated
| userPath = homePath; | ||
| userPath += "/.config"; | ||
| // Check if portable config is present. If not, find it in user's directory | ||
| QString portablePath = QDir::currentPath() + "/keepassxc.ini"; |
Member
There was a problem hiding this comment.
@droidmonkey doesn't QDir::currentPath return the path from which the executable was launched, and not necessarily the path of the executable itself? Using QCoreApplication::applicationDirPath() would return the path of the executable instead.
Member
Author
There was a problem hiding this comment.
Good point, I will make that correction! I wish the documentation was a little more explicit.
TheZ3ro
approved these changes
Jun 19, 2017
louib
approved these changes
Jun 19, 2017
droidmonkey
added a commit
that referenced
this pull request
Jun 25, 2017
- Added YubiKey 2FA integration for unlocking databases [#127] - Added TOTP support [#519] - Added CSV import tool [#146, #490] - Added KeePassXC CLI tool [#254] - Added diceware password generator [#373] - Added support for entry references [#370, #378] - Added support for Twofish encryption [#167] - Enabled DEP and ASLR for in-memory protection [#371] - Enabled single instance mode [#510] - Enabled portable mode [#645] - Enabled database lock on screensaver and session lock [#545] - Redesigned welcome screen with common features and recent databases [#292] - Multiple updates to search behavior [#168, #213, #374, #471, #603, #654] - Added auto-type fields {CLEARFIELD}, {SPACE}, {{}, {}} [#267, #427, #480] - Fixed auto-type errors on Linux [#550] - Prompt user prior to executing a cmd:// URL [#235] - Entry attributes can be protected (hidden) [#220] - Added extended ascii to password generator [#538] - Added new database icon to toolbar [#289] - Added context menu entry to empty recycle bin in databases [#520] - Added "apply" button to entry and group edit windows [#624] - Added macOS tray icon and enabled minimize on close [#583] - Fixed issues with unclean shutdowns [#170, #580] - Changed keyboard shortcut to create new database to CTRL+SHIFT+N [#515] - Compare window title to entry URLs [#556] - Implemented inline error messages [#162] - Ignore group expansion and other minor changes when making database "dirty" [#464] - Updated license and copyright information on souce files [#632] - Added contributors list to about dialog [#629]
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Implements #231. Config class checks for presence of keepassxc.ini in the run directory prior to checking the user's folder. If no ini file was found, the app proceeds as before with the user's stored config.
Motivation and context
When deploying keepassxc as a portable app (.zip or .tar.gz) we will pre-package a keepassxc.ini config such that one is never created in the user's directory on first run. All other distribution methods will use the original behavior prior to this PR.
How has this been tested?
Manually
Types of changes
Checklist:
-DWITH_ASAN=ON. [REQUIRED]