Skip to content
This repository has been archived by the owner on Jan 18, 2024. It is now read-only.

[xdl] Improve keytool errors #3190

Merged
merged 1 commit into from
Feb 4, 2021
Merged
Changes from all commits
Commits
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
24 changes: 21 additions & 3 deletions packages/xdl/src/credentials/AndroidCredentials.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@ export async function exportCertBinary(
log.info('keytool is a part of OpenJDK: https://openjdk.java.net/');
log.info('Also make sure that keytool is in your PATH after installation.');
}
if (err.stdout) {
log.info(err.stdout);
}
if (err.stderr) {
log.error(err.stderr);
}
throw err;
}
}
Expand Down Expand Up @@ -85,6 +91,12 @@ export async function exportCertBase64(
log.info('keytool is a part of OpenJDK: https://openjdk.java.net/');
log.info('Also make sure that keytool is in your PATH after installation.');
}
if (err.stdout) {
log.info(err.stdout);
}
if (err.stderr) {
log.error(err.stderr);
}
throw err;
}
}
Expand Down Expand Up @@ -174,13 +186,19 @@ export async function createKeystore(
'-dname',
`CN=${androidPackage},OU=,O=,L=,S=,C=US`,
]);
} catch (error) {
if (error.code === 'ENOENT') {
} catch (err) {
if (err.code === 'ENOENT') {
log.warn('Are you sure you have keytool installed?');
log.info('keytool is a part of OpenJDK: https://openjdk.java.net/');
log.info('Also make sure that keytool is in your PATH after installation.');
}
throw error;
if (err.stdout) {
log.info(err.stdout);
}
if (err.stderr) {
log.error(err.stderr);
}
throw err;
}
}

Expand Down