From 5272c8b31dc1623d002d38b1a957e2cd76b04e66 Mon Sep 17 00:00:00 2001 From: Nika Gerson Lohman Date: Fri, 7 Dec 2018 22:45:01 +0100 Subject: [PATCH 1/3] Start vbs directly from extractor --- core/extractor/extractor.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/extractor/extractor.py b/core/extractor/extractor.py index cdc4f817..1eb2cb1e 100644 --- a/core/extractor/extractor.py +++ b/core/extractor/extractor.py @@ -17,8 +17,9 @@ def extract(filePath, outputDestination): if not os.path.exists(core.SEVENZIP): core.logger.error("EXTRACTOR: Could not find 7-zip, Exiting") return False - invislocation = os.path.join(core.PROGRAM_DIR, 'core', 'extractor', 'bin', 'invisible.cmd') - cmd_7zip = [invislocation, str(core.SHOWEXTRACT), core.SEVENZIP, "x", "-y"] + wscriptlocation = os.path.join(os.environ['WINDIR'], 'system32', 'wscript.exe') + invislocation = os.path.join(core.PROGRAM_DIR, 'core', 'extractor', 'bin', 'invisible.vbs') + cmd_7zip = [wscriptlocation, invislocation, str(core.SHOWEXTRACT), core.SEVENZIP, "x", "-y"] ext_7zip = [".rar", ".zip", ".tar.gz", "tgz", ".tar.bz2", ".tbz", ".tar.lzma", ".tlz", ".7z", ".xz"] EXTRACT_COMMANDS = dict.fromkeys(ext_7zip, cmd_7zip) # Using unix From 1817ac349dceb5ee229f68feceb7d43d0b755d68 Mon Sep 17 00:00:00 2001 From: Nika Gerson Lohman Date: Fri, 7 Dec 2018 22:45:22 +0100 Subject: [PATCH 2/3] Delete invisible.cmd --- core/extractor/bin/invisible.cmd | 2 -- 1 file changed, 2 deletions(-) delete mode 100755 core/extractor/bin/invisible.cmd diff --git a/core/extractor/bin/invisible.cmd b/core/extractor/bin/invisible.cmd deleted file mode 100755 index 29acd209..00000000 --- a/core/extractor/bin/invisible.cmd +++ /dev/null @@ -1,2 +0,0 @@ -start /B /wait wscript "%~dp0\invisible.vbs" %* -exit %ERRORLEVEL% From c2a591c8bbf0cbdd62078ccae8f4a5e3ddf1c2b1 Mon Sep 17 00:00:00 2001 From: Nika Gerson Lohman Date: Fri, 7 Dec 2018 22:46:31 +0100 Subject: [PATCH 3/3] Use args instead of Wscript.Arguments --- core/extractor/bin/invisible.vbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/extractor/bin/invisible.vbs b/core/extractor/bin/invisible.vbs index 415fc7cc..01979e2a 100755 --- a/core/extractor/bin/invisible.vbs +++ b/core/extractor/bin/invisible.vbs @@ -17,5 +17,5 @@ end if Set WshShell = WScript.CreateObject("WScript.Shell") -returnValue = WshShell.Run("""" & WScript.Arguments(1) & """" & sargs, WScript.Arguments(0), True) +returnValue = WshShell.Run("""" & args(1) & """" & sargs, args(0), True) WScript.Quit(returnValue)