version should be printed, before any env is read

This commit is contained in:
Patrick Siegl
2019-03-21 22:37:04 +01:00
parent fb270db373
commit d6bdd34b85

View File

@@ -177,6 +177,13 @@ int main(int argc, char **argv) {
return opts.none;
}
if (opts.version) {
printf("GIT VERSION - %s\n", GIT_VERSION);
printf("GIT COMMIT - %s\n", GIT_COMMIT);
printf("GIT DATE - %s\n", GIT_DATE);
return 0;
}
// read environment variables, not overriding command line options
if (opts.serial == NULL) {
opts.serial = getenv("INFNOISE_SERIAL");
@@ -207,13 +214,6 @@ int main(int argc, char **argv) {
opts.outputMultiplier = 2u; // Don't throw away entropy when writing to /dev/random unless told to do so
}
if (opts.version) {
printf("GIT VERSION - %s\n", GIT_VERSION);
printf("GIT COMMIT - %s\n", GIT_COMMIT);
printf("GIT DATE - %s\n", GIT_DATE);
return 0;
}
if (opts.listDevices) {
devlist_node devlist = listUSBDevices(&context.message);
if (devlist == NULL) {