Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

dbeaver/dbeaver#28259 Portable DBeaver product distribution #29935

Merged
merged 5 commits into from
May 13, 2024
Merged

dbeaver/dbeaver#28259 Portable DBeaver product distribution #29935

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
96b32cd
dbeaver/dbeaver#28259 Portable DBeaver product distribution
serjiokov May 7, 2024
f3e4848
dbeaver/dbeaver#28259 Portable DBeaver product distribution
serjiokov May 8, 2024
24c16a9
dbeaver/dbeaver#28259 Minor
serjiokov May 8, 2024
37182ed
dbeaver/dbeaver#28259 Minor
serjiokov May 8, 2024
558c6f6
dbeaver/dbeaver#28259 Extra log disabled
serjiokov May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 19 additions & 7 deletions plugins/org.jkiss.dbeaver.launcher/src/org/jkiss/dbeaver/launcher/DBeaverLauncher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1778,21 +1778,33 @@
}

/**
* Specific method for dbeaver products group designed to resolve product configuration location in
* common system place:
* ~/user/APP_DATA - WinOS
* ~/Library - MacOS
* ~/.local/share - Unix
* Specific method for Dbeaver products group to resolve product configuration
* location in<br>
* case of portable distribution (tar/zip) location used current location:
* <li>./configuration</><br>

Check warning on line 1784 in plugins/org.jkiss.dbeaver.launcher/src/org/jkiss/dbeaver/launcher/DBeaverLauncher.java

View check run for this annotation

Jenkins-CI-integration / CheckStyle Report

plugins/org.jkiss.dbeaver.launcher/src/org/jkiss/dbeaver/launcher/DBeaverLauncher.java#L1784 

Javadoc comment at column 27 has parse error. Details: no viable alternative at input </> while parsing HTML_ELEMENT
* case of installation in system place:
* <li>~/user/APP_DATA - WinOS
* <li>~/Library - MacOS
* <li>~/.local/share - Unix
*
* @return url of location
*/
private URL buildProductURL() {
String productConfigurationLocation;
try {
URL installationUrl = new URL(getInstallLocation(), CONFIG_DIR);
if (checkConfigurationLocation(installationUrl)) {
return installationUrl;
}
} catch (Exception e) {
if (debug) {
System.out.println("Can not read product properties. " + e.getMessage()); //$NON-NLS-1$
}
}
String base = getWorkingDirectory(DBEAVER_DATA_FOLDER);
try {
String productPath = getProductProperties();
Path basePath = Paths.get(base, DBEAVER_INSTALL_FOLDER, productPath);
productConfigurationLocation = basePath.toFile().getAbsolutePath();
String productConfigurationLocation = basePath.toFile().getAbsolutePath();
return buildURL(productConfigurationLocation, true);
} catch (IOException e) {
if (debug)
Expand Down