andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

only:partial revert to original behavior 

Autoupdate should get the default white label from its jar filename. #6838
This commit is contained in:
rusefillc 2024-08-21 17:00:20 -04:00
parent 6a9912791e
commit 36670b0e5b
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
java_console/shared_io/src/main/java/com/rusefi/core/net/ConnectionAndMeta.java
View File

@ -42,7 +42,7 @@ public class ConnectionAndMeta {
return result;
}
public static String getWhiteLabelFromJarName() {
public static String getJarFileNamePrefix() {
try {
CodeSource codeSource = ConnectionAndMeta.class.getProtectionDomain().getCodeSource();
if (codeSource != null) {
@ -51,23 +51,23 @@ public class ConnectionAndMeta {
String jarFileName = jarPath.substring(jarPath.lastIndexOf('/') + 1);
int startOfSuffix = jarFileName.lastIndexOf('_');
if (startOfSuffix > 0) {
String whiteLabel = jarFileName.substring(0, startOfSuffix);
log.info("WhiteLabel = " + whiteLabel);
return whiteLabel;
String jarFilePrefix = jarFileName.substring(0, startOfSuffix);
log.info("jarFilePrefix = " + jarFilePrefix);
return jarFilePrefix;
}
}
} catch (Exception e) {
log.error("Unexpected " + e, e);
}
return DEFAULT_WHITE_LABEL;
return "rusefi";
}
public static String getWhiteLabel(Properties properties) {
return getStringProperty(properties, "white_label", getWhiteLabelFromJarName());
return getStringProperty(properties, "white_label", DEFAULT_WHITE_LABEL);
}
public static String getRusEfiConsoleJarName() {
return getStringProperty(getProperties(), "console_jar", getWhiteLabel(getProperties()) + "_console.jar");
return getStringProperty(getProperties(), "console_jar", getJarFileNamePrefix() + "_console.jar");
}
private static @NotNull String getStringProperty(Properties properties, String key, String defaultValue) {