mobeigi
/
filebot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* possible fix for all these DBUS warnings on headless machines

This commit is contained in:
Reinhard Pointner 2013-02-04 09:51:37 +00:00
parent 70376e97f1
commit c722008d65
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
installer/ubuntu/filebot.sh
View File

@ -1,2 +1,2 @@
#!/bin/bash #!/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 "$@" 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 "$@"

2
installer/webstart/filebot.jnlp
View File

@ -4,7 +4,7 @@
<title>FileBot</title> <title>FileBot</title>
<vendor>Reinhard Pointner</vendor> <vendor>Reinhard Pointner</vendor>
<homepage href="http://filebot.sourceforge.net" /> <homepage href="http://filebot.sourceforge.net" />
<description>The ultimate TV Renamer and Subtitle Downloader</description> <description>The ultimate TV and Movie Renamer</description>
<icon href="icon48.png" width="48" height="48" /> <icon href="icon48.png" width="48" height="48" />
<icon href="icon32.png" width="32" height="32" /> <icon href="icon32.png" width="32" height="32" />

12
source/net/sourceforge/filebot/Analytics.java
View File

@ -154,8 +154,13 @@ public class Analytics {
if (Platform.isWindows()) { if (Platform.isWindows()) {
wm = "Windows"; wm = "Windows";
os = "Windows NT " + System.getProperty("os.version"); os = "Windows NT " + System.getProperty("os.version");
} else if (Platform.isX11()) { } else if (Platform.isMac()) {
wm = "X11"; wm = "Macintosh";
os = System.getProperty("os.name");
} else {
if (!GraphicsEnvironment.isHeadless() && Platform.isX11())
wm = "X11";
if (Platform.isLinux()) if (Platform.isLinux())
os = "Linux " + System.getProperty("os.arch"); os = "Linux " + System.getProperty("os.arch");
else if (Platform.isSolaris()) else if (Platform.isSolaris())
@ -164,9 +169,6 @@ public class Analytics {
os = "FreeBSD"; os = "FreeBSD";
else if (Platform.isOpenBSD()) else if (Platform.isOpenBSD())
os = "OpenBSD"; os = "OpenBSD";
} else if (Platform.isMac()) {
wm = "Macintosh";
os = System.getProperty("os.name");
} }
} catch (Throwable e) { } catch (Throwable e) {
// ignore any Platform detection issues and especially ignore LinkageErrors that might occur on headless machines // ignore any Platform detection issues and especially ignore LinkageErrors that might occur on headless machines