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

Fix NSIS installer issues

This commit is contained in:
Reinhard Pointner 2016-03-08 16:40:44 +00:00
parent a367bffcc4
commit 022c2c40a3
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
installer/nsis/filebot.nsi
View File

@ -113,7 +113,7 @@ Section MAIN
${if} $MSI_STATUS == "0" ${if} $MSI_STATUS == "0"
DetailPrint "Optimizing..." DetailPrint "Optimizing..."
nsExec::ExecToLog `"C:\Program Files\FileBot\filebot.exe" -script "g:println net.filebot.Settings.applicationIdentifier; println 'JRE: ' + Settings.getJavaRuntimeIdentifier(); println String.format('JVM: %d-bit %s', com.sun.jna.Platform.is64Bit() ? 64 : 32, _system['java.vm.name']); java.util.prefs.Preferences.userRoot(); net.sf.ehcache.CacheManager.getInstance().clearAll(); net.filebot.media.MediaDetection.warmupCachedResources();" --log OFF` nsExec::ExecToLog `"C:\Program Files\FileBot\filebot.exe" -script "g:println net.filebot.Settings.getApplicationIdentifier(); println 'JRE: ' + Settings.getJavaRuntimeIdentifier(); println String.format('JVM: %d-bit %s', com.sun.jna.Platform.is64Bit() ? 64 : 32, System.getProperty('java.vm.name')); java.util.prefs.Preferences.userRoot(); net.filebot.CacheManager.getInstance().clearAll(); net.filebot.media.MediaDetection.warmupCachedResources();" --log OFF`
DetailPrint "Done." DetailPrint "Done."
${else} ${else}
DetailPrint "msiexec error $MSI_STATUS" DetailPrint "msiexec error $MSI_STATUS"

6
source/net/filebot/Main.java
View File

@ -99,6 +99,12 @@ public class Main {
// update system properties // update system properties
initializeSystemProperties(args); initializeSystemProperties(args);
// update logging level
log.setLevel(args.getLogLevel());
if (debug.getLevel().intValue() < log.getLevel().intValue()) {
debug.setLevel(log.getLevel());
}
// tee stdout and stderr to log file if set // tee stdout and stderr to log file if set
if (args.logFile != null) { if (args.logFile != null) {
File logFile = new File(args.logFile); File logFile = new File(args.logFile);

2
source/net/filebot/cli/ArgumentProcessor.java
View File

@ -29,8 +29,6 @@ import net.filebot.cli.ScriptShell.ScriptProvider;
public class ArgumentProcessor { public class ArgumentProcessor {
public int process(ArgumentBean args, CmdlineInterface cli) { public int process(ArgumentBean args, CmdlineInterface cli) {
log.setLevel(args.getLogLevel());
try { try {
// print episode info // print episode info
if (args.list) { if (args.list) {