Fix NSIS installer issues
This commit is contained in:
parent
a367bffcc4
commit
022c2c40a3
|
@ -113,7 +113,7 @@ Section MAIN
|
|||
|
||||
${if} $MSI_STATUS == "0"
|
||||
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."
|
||||
${else}
|
||||
DetailPrint "msiexec error $MSI_STATUS"
|
||||
|
|
|
@ -99,6 +99,12 @@ public class Main {
|
|||
// update system properties
|
||||
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
|
||||
if (args.logFile != null) {
|
||||
File logFile = new File(args.logFile);
|
||||
|
|
|
@ -29,8 +29,6 @@ import net.filebot.cli.ScriptShell.ScriptProvider;
|
|||
public class ArgumentProcessor {
|
||||
|
||||
public int process(ArgumentBean args, CmdlineInterface cli) {
|
||||
log.setLevel(args.getLogLevel());
|
||||
|
||||
try {
|
||||
// print episode info
|
||||
if (args.list) {
|
||||
|
|
Loading…
Reference in New Issue