skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Make default counter algorithm-scoped, format-specific unmarshalling.

Browse Source
This commit is contained in:
Maarten Billemont
2018-04-26 12:45:29 -04:00
parent 71f1b3c130
commit 11185725d1
15 changed files with 133 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform-independent/cli-c/cli/mpw-cli.c
View File

@@ -77,7 +77,7 @@ static void usage() {
" Defaults to 1.\n" );
inf( ""
" -a version The algorithm version to use, %d - %d.\n"
" Defaults to %s in env or %d.\n",
" Defaults to env var %s or %d.\n",
MPAlgorithmVersionFirst, MPAlgorithmVersionLast, MP_ENV_algorithm, MPAlgorithmVersionCurrent );
inf( ""
" -p purpose The purpose of the generated token.\n"
@@ -95,7 +95,7 @@ static void usage() {
" -f|F format The mpsites format to use for reading/writing site parameters.\n"
" -F forces the use of the given format,\n"
" -f allows fallback/migration.\n"
" Defaults to %s in env or json, falls back to plain.\n"
" Defaults to env var %s or json, falls back to plain.\n"
" n, none | No file\n"
" f, flat | ~/.mpw.d/Full Name.%s\n"
" j, json | ~/.mpw.d/Full Name.%s\n",

5
platform-independent/gui-java/build.gradle
View File

@@ -13,3 +13,8 @@ dependencies {
compile group: 'ch.qos.logback', name: 'logback-classic', version:'1.1.2'
compile group: 'com.yuvimasory', name: 'orange-extensions', version:'1.3.0'
}
run {
// I don't fully understand why this is necessary, but without it -Dmp.log.level is lost.
systemProperties = System.properties
}