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

Update deployment properties

This commit is contained in:
Reinhard Pointner 2016-09-19 15:00:18 +08:00
parent 2dae794984
commit 84d5cfbb9d
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
installer/appx/filebot.launcher.l4j.ini
View File

@ -1,5 +1,5 @@
# FileBot launch4j runtime config
-Dapplication.deployment=msi
-Dapplication.deployment=appx
-Dapplication.dir="%APPDATA%\FileBot"
# put all temporary files here

2
installer/snappy/filebot/filebot.sh
View File

@ -13,4 +13,4 @@ export APP_DATA="$SNAP_USER_DATA/data"
export APP_CACHE="$SNAP_USER_DATA/cache"
export APP_PREFS="$SNAP_USER_DATA/prefs"
java -Duser.home="$SNAP_USER_DATA" -Djava.library.path="$LD_LIBRARY_PATH" -Djna.library.path="$LD_LIBRARY_PATH" -Dunixfs=false -DuseGVFS=true -DuseExtendedFileAttributes=true -DuseCreationDate=false -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Djava.net.useSystemProxies=true -Dapplication.update=skip -Dapplication.deployment=usc -Dnet.filebot.UserFiles.fileChooser=JavaFX -Dapplication.dir="$APP_DATA" -Dapplication.cache="$APP_CACHE/ehcache.disk.store" -Djava.io.tmpdir="$APP_CACHE/java.io.tmpdir" -Djava.util.prefs.userRoot="$APP_PREFS/user" -Djava.util.prefs.systemRoot="$APP_PREFS/system" -Dnet.filebot.AcoustID.fpcalc="$SNAP/usr/bin/fpcalc" $JAVA_OPTS -jar "$APP_ROOT/FileBot.jar" "$@"
java -Duser.home="$SNAP_USER_DATA" -Djava.library.path="$LD_LIBRARY_PATH" -Djna.library.path="$LD_LIBRARY_PATH" -Dunixfs=false -DuseGVFS=true -DuseExtendedFileAttributes=true -DuseCreationDate=false -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Djava.net.useSystemProxies=true -Dapplication.update=skip -Dapplication.deployment=snap -Dnet.filebot.UserFiles.fileChooser=JavaFX -Dapplication.dir="$APP_DATA" -Dapplication.cache="$APP_CACHE/ehcache.disk.store" -Djava.io.tmpdir="$APP_CACHE/java.io.tmpdir" -Djava.util.prefs.userRoot="$APP_PREFS/user" -Djava.util.prefs.systemRoot="$APP_PREFS/system" -Dnet.filebot.AcoustID.fpcalc="$SNAP/usr/bin/fpcalc" $JAVA_OPTS -jar "$APP_ROOT/FileBot.jar" "$@"

14
source/net/filebot/Settings.java
View File

@ -87,15 +87,15 @@ public final class Settings {
}
public static boolean isAppStore() {
return isApplicationDeployment("mas", "usc");
return isApplicationDeployment("mas", "appx");
}
public static boolean isWindowsApp() {
return isApplicationDeployment("msi");
return isApplicationDeployment("appx", "msi");
}
public static boolean isUbuntuApp() {
return isApplicationDeployment("usc");
return isApplicationDeployment("snap");
}
public static boolean isMacApp() {
@ -107,7 +107,7 @@ public final class Settings {
}
public static boolean isInstalled() {
return isApplicationDeployment("mas", "usc", "msi", "spk", "aur");
return isApplicationDeployment("mas", "appx", "snap", "msi", "spk", "aur");
}
private static boolean isApplicationDeployment(String... ids) {
@ -143,6 +143,8 @@ public final class Settings {
public static String getAppStoreName() {
if (isMacApp())
return "Mac App Store";
if (isWindowsApp())
return "Windows Store";
if (isUbuntuApp())
return "Ubuntu Software Center";
@ -152,8 +154,10 @@ public final class Settings {
public static String getAppStoreLink() {
if (isMacApp())
return getApplicationProperty("link.mas");
if (isWindowsApp())
return null;
if (isUbuntuApp())
return getApplicationProperty("link.usc");
return null;
return null;
}

1
source/net/filebot/Settings.properties
View File

@ -13,7 +13,6 @@ github.master: https://raw.githubusercontent.com/filebot/scripts/master/
# native links
link.mas: macappstore://itunes.apple.com/app/id905384638
link.usc: apt://filebot
# application help
link.app.help: http://app.filebot.net/getting-started/embed.html