From c722008d6544e9530e06913ca756b9cfc89faeaa Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Mon, 4 Feb 2013 09:51:37 +0000 Subject: [PATCH] * possible fix for all these DBUS warnings on headless machines --- installer/ubuntu/filebot.sh | 2 +- installer/webstart/filebot.jnlp | 2 +- source/net/sourceforge/filebot/Analytics.java | 12 +++++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/installer/ubuntu/filebot.sh b/installer/ubuntu/filebot.sh index dde816a0..6c499c60 100644 --- a/installer/ubuntu/filebot.sh +++ b/installer/ubuntu/filebot.sh @@ -1,2 +1,2 @@ #!/bin/bash -java -Xmx256m -Dunixfs=false -DuseGVFS=true -DuseExtendedFileAttributes=true -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapplication.deployment=ppa -Dapplication.analytics=false -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/temp -Djna.library.path=/usr/share/filebot -Djava.library.path=/usr/share/filebot -jar /usr/share/filebot/FileBot.jar "$@" \ No newline at end of file +java -Xmx256m -Dunixfs=false -DuseGVFS=true -DuseExtendedFileAttributes=true -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapplication.update=skip -Dapplication.deployment=ppa -Dapplication.analytics=false -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/temp -Djna.library.path=/usr/share/filebot -Djava.library.path=/usr/share/filebot -jar /usr/share/filebot/FileBot.jar "$@" \ No newline at end of file diff --git a/installer/webstart/filebot.jnlp b/installer/webstart/filebot.jnlp index fa537a7d..c47eb16a 100644 --- a/installer/webstart/filebot.jnlp +++ b/installer/webstart/filebot.jnlp @@ -4,7 +4,7 @@ FileBot Reinhard Pointner - The ultimate TV Renamer and Subtitle Downloader + The ultimate TV and Movie Renamer diff --git a/source/net/sourceforge/filebot/Analytics.java b/source/net/sourceforge/filebot/Analytics.java index 84bd6075..a60364b4 100644 --- a/source/net/sourceforge/filebot/Analytics.java +++ b/source/net/sourceforge/filebot/Analytics.java @@ -154,8 +154,13 @@ public class Analytics { if (Platform.isWindows()) { wm = "Windows"; os = "Windows NT " + System.getProperty("os.version"); - } else if (Platform.isX11()) { - wm = "X11"; + } else if (Platform.isMac()) { + wm = "Macintosh"; + os = System.getProperty("os.name"); + } else { + if (!GraphicsEnvironment.isHeadless() && Platform.isX11()) + wm = "X11"; + if (Platform.isLinux()) os = "Linux " + System.getProperty("os.arch"); else if (Platform.isSolaris()) @@ -164,9 +169,6 @@ public class Analytics { os = "FreeBSD"; else if (Platform.isOpenBSD()) os = "OpenBSD"; - } else if (Platform.isMac()) { - wm = "Macintosh"; - os = System.getProperty("os.name"); } } catch (Throwable e) { // ignore any Platform detection issues and especially ignore LinkageErrors that might occur on headless machines