version should be printed, before any env is read
This commit is contained in:
@@ -177,6 +177,13 @@ int main(int argc, char **argv) {
|
|||||||
return opts.none;
|
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
|
// read environment variables, not overriding command line options
|
||||||
if (opts.serial == NULL) {
|
if (opts.serial == NULL) {
|
||||||
opts.serial = getenv("INFNOISE_SERIAL");
|
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
|
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) {
|
if (opts.listDevices) {
|
||||||
devlist_node devlist = listUSBDevices(&context.message);
|
devlist_node devlist = listUSBDevices(&context.message);
|
||||||
if (devlist == NULL) {
|
if (devlist == NULL) {
|
||||||
|
|||||||
Reference in New Issue
Block a user