ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2024-12-24 07:06:46 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Clean up Main class for readability

Browse Source
This commit is contained in:
chubtub 2024-01-23 13:36:01 -05:00
parent ea79dbfddf
commit 5e3ab59dad
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tools/tcg_rim_tool/src/main/java/hirs/swid/Main.java
View File

@ -31,17 +31,7 @@ public class Main {
String version = new String(content); String version = new String(content);
System.out.println("TCG rimtool version: " + version); System.out.println("TCG rimtool version: " + version);
} catch (IOException e) { } catch (IOException e) {
System.out.println("Installation file VERSION not found."); parseVersionFromJar();
String filename = new File(Main.class.getProtectionDomain()
.getCodeSource()
.getLocation()
.getPath()).getName();
Pattern pattern = Pattern.compile("(?<=tcg_rim_tool-)[0-9]\\.[0-9]\\.[0-9]");
Matcher matcher = pattern.matcher(filename);
if (matcher.find()) {
System.out.println("TCG rimtool version: " + matcher.group());
}
} }
} else { } else {
if (!commander.getVerifyFile().isEmpty()) { if (!commander.getVerifyFile().isEmpty()) {
@ -127,4 +117,21 @@ public class Main {
} }
} }
} }
/**
* This method parses the version number from the jar filename in the absence of
* the VERSION file expected with an rpm installation.
*/
private static void parseVersionFromJar() {
System.out.println("Installation file VERSION not found.");
String filename = new File(Main.class.getProtectionDomain()
.getCodeSource()
.getLocation()
.getPath()).getName();
Pattern pattern = Pattern.compile("(?<=tcg_rim_tool-)[0-9]\\.[0-9]\\.[0-9]");
Matcher matcher = pattern.matcher(filename);
if (matcher.find()) {
System.out.println("TCG rimtool version: " + matcher.group());
}
}
} }