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.

Sign up for GitHub

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

Jump to bottom

Command-Line Arguments extensions #33

Merged
merged 3 commits into from
Mar 24, 2021
Merged

Command-Line Arguments extensions #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c24dcd2
added version
dmk-rib Mar 24, 2021
19396a7
added cert
dmk-rib Mar 24, 2021
7ed56a8
utils
dmk-rib Mar 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions lib/src/configuration.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,15 @@ class Configuration {

if (!pubspec['msix_config'].toString().isNull) {
displayName = pubspec['msix_config']['display_name'].toString();
publisherName =
pubspec['msix_config']['publisher_display_name'].toString();
publisherName = pubspec['msix_config']['publisher_display_name'].toString();
identityName = pubspec['msix_config']['identity_name'].toString();
msixVersion = pubspec['msix_config']['msix_version'].toString();
msixVersion = argResults.read('version',
fallback: pubspec['msix_config']['msix_version'].toString());
publisher = pubspec['msix_config']['publisher'].toString();
certificatePath = pubspec['msix_config']['certificate_path'].toString();

if (argResults['password'] != null &&
argResults['password'].toString().length > 0) {
certificatePassword = argResults['password'];
} else {
certificatePassword =
pubspec['msix_config']['certificate_password'].toString();
}

certificatePath = argResults.read('certificate',
fallback: pubspec['msix_config']['certificate_path'].toString());
certificatePassword = argResults.read('password',
fallback: pubspec['msix_config']['certificate_password'].toString());
logoPath = pubspec['msix_config']['logo_path'].toString();
startMenuIconPath =
pubspec['msix_config']['start_menu_icon_path'].toString();
Expand All @@ -74,7 +68,10 @@ class Configuration {

/// parse the cli options
void _parseCliArguments(List<String> args) {
var parser = ArgParser()..addOption('password', abbr: 'p');
var parser = ArgParser()
..addOption('password', abbr: 'p')
..addOption('certificate', abbr: 'c')
..addOption('version', abbr: 'v');

try {
argResults = parser.parse(args);
Expand Down
7 changes: 7 additions & 0 deletions lib/src/utils.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,10 @@ printTestCertificateHelp() {
'https://www.advancedinstaller.com/install-test-certificate-from-msix.html'));
print('');
}

extension ArgResultsReader on ArgResults {
String? read(String key, {String? fallback}) =>
this[key] != null && this[key].toString().length > 0
? this[key]
: fallback;
}