From a1451ca807e73317b5091f5ab7183df3c71527e7 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Tue, 30 Apr 2013 13:33:09 +0000 Subject: [PATCH] * fix unix argument parsing issues @see http://www.filebot.net/forums/viewtopic.php?f=4&p=4633 --- source/net/sourceforge/filebot/cli/ScriptShell.lib.groovy | 7 +++++-- website/data/query-blacklist.txt | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/source/net/sourceforge/filebot/cli/ScriptShell.lib.groovy b/source/net/sourceforge/filebot/cli/ScriptShell.lib.groovy index 28f3e329..a2134569 100644 --- a/source/net/sourceforge/filebot/cli/ScriptShell.lib.groovy +++ b/source/net/sourceforge/filebot/cli/ScriptShell.lib.groovy @@ -139,11 +139,14 @@ def XML(bc) { import com.sun.jna.Platform def execute(Object... args) { - def cmd = args.length == 1 ? args[0] as String : args.collect{ it as String } + def cmd = args.collect{ it as String } - if (tryQuietly{ Platform.isWindows() }) { + if (Platform.isWindows()) { // normalize file separator for windows and run with cmd so any executable in PATH will just work cmd = ['cmd', '/c'] + cmd + } else if (cmd.size() == 1) { + // make unix shell parse arguments + cmd = ['sh', '-c'] + cmd } // run command and print output diff --git a/website/data/query-blacklist.txt b/website/data/query-blacklist.txt index 463dcbef..66f9463a 100644 --- a/website/data/query-blacklist.txt +++ b/website/data/query-blacklist.txt @@ -7,6 +7,7 @@ [1-3]CD [1-3]CDRip [1-9].?of.?[1-9] +\bThe$ \d{2,4}.\b\d{2}.\b\d{2}.\b\d{2}.\b\d{2} ^(TV.)?(Show|Serie)[s]? ^[0-9]{1,2}[.]