Skip to content

Commit

Permalink
Fixed Ubuntu edomh:// url registration
Browse files Browse the repository at this point in the history
  • Loading branch information
jixxed committed Jan 1, 2025
1 parent fc20a8e commit 8513c4e
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/releasenotes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ The auto updaters will check for a new version on launch.
The portable zip versions are used as update packages. You can run them standalone, but they are no longer truly portable as settings are stored on the local machine.

**Release notes for this version:**
Added some additional linux builds for the auto updater
Improved handling of corrupted journal files
Fixed Ubuntu edomh:// url registration
Fixed audio of notifications stops playing after a while
1 change: 1 addition & 0 deletions application/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ jlink {
// excludeProvides servicePattern: "jakarta.servlet.*"
}
jpackage{
skipInstaller = true
if(OperatingSystem.current().isLinux()){
imageOptions += ['--icon', 'src/main/resources/images/application/rocket.png']
}else{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public void register() {
if (!IS_JAVA) {
final File file = Files.createFile(Path.of(System.getProperty(USER_HOME) + DESKTOP_FILE_PATH)).toFile();
writeDesktopFile(file);
Runtime.getRuntime().exec("xdg-mime default " + System.getProperty(USER_HOME) + "/.local/share/applications/edomh.desktop x-scheme-handler/edomh").waitFor();
Runtime.getRuntime().exec("xdg-mime default edomh.desktop x-scheme-handler/edomh").waitFor();
Runtime.getRuntime().exec("update-desktop-database " + System.getProperty(USER_HOME) + "/.local/share/applications/").waitFor();//
}
} catch (final IOException | InterruptedException e) {
Expand Down
5 changes: 5 additions & 0 deletions application/src/main/resources/text/whatsnew.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Version 2.132
-------------
Fixed Ubuntu edomh:// url registration
Fixed audio of notifications stops playing after a while

Version 2.131
-------------
Added some additional linux builds for the auto updater
Expand Down
5 changes: 5 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,23 @@ tasks.register('copyMsi', Copy) {
}

tasks.register('copyDeb', Copy) {
dependsOn(":bootstrap:jpackage")
from 'bootstrap/build/jpackage/'
into 'output'
include('elite-dangerous-odyssey-materials-helper_' + version + '_amd64.deb')
rename('elite-dangerous-odyssey-materials-helper_' + version + '_amd64.deb', 'elite-dangerous-odyssey-materials-helper-auto-updater_' + version + '.deb')
}

tasks.register('copyRpm', Copy) {
dependsOn(":bootstrap:jpackage")
from 'bootstrap/build/jpackage/'
into 'output'
include('elite-dangerous-odyssey-materials-helper-' + version + '-1.x86_64.rpm')
rename('elite-dangerous-odyssey-materials-helper-' + version + '-1.x86_64.rpm', 'elite-dangerous-odyssey-materials-helper-auto-updater_' + version + '.rpm')
}

tasks.register('makePortable', Zip) {
dependsOn(":application:jpackage")
from 'application/build/jpackage/Elite Dangerous Odyssey Materials Helper'
include '*'
include '**/*' //to include contents of a folder present inside Reports directory
Expand All @@ -55,6 +58,7 @@ tasks.register('makePortable', Zip) {
}

tasks.register('makeLinuxPortable', Zip) {
dependsOn(":application:jpackage")
from 'application/build/jpackage/Elite Dangerous Odyssey Materials Helper'
include '*'
include '**/*' //to include contents of a folder present inside Reports directory
Expand All @@ -63,6 +67,7 @@ tasks.register('makeLinuxPortable', Zip) {
}

tasks.register('makeLinuxAutoUpdaterPortable', Zip) {
dependsOn(":bootstrap:jpackage")
from 'bootstrap/build/jpackage/Elite Dangerous Odyssey Materials Helper Launcher'
include '*'
include '**/*' //to include contents of a folder present inside Reports directory
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
org.gradle.parallel=true
org.gradle.caching=true
version=2.131
version=2.132

0 comments on commit 8513c4e

Please sign in to comment.