forked from p34709852/monkey
Fix various bugs
This commit is contained in:
parent
e30e9c8b83
commit
bbdebb1268
|
@ -1,5 +1,6 @@
|
||||||
import os
|
import os
|
||||||
import struct
|
import struct
|
||||||
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
import monkeyfs
|
import monkeyfs
|
||||||
|
@ -42,12 +43,14 @@ class WindowsUpgrader(object):
|
||||||
with open(WormConfiguration.dropper_upgrade_win_64_temp_path, 'wb') as written_monkey_file:
|
with open(WormConfiguration.dropper_upgrade_win_64_temp_path, 'wb') as written_monkey_file:
|
||||||
written_monkey_file.write(monkey_bin)
|
written_monkey_file.write(monkey_bin)
|
||||||
|
|
||||||
|
depth = int(opts.depth) if opts.depth is not None else None
|
||||||
monkey_options = build_monkey_commandline_explicitly(
|
monkey_options = build_monkey_commandline_explicitly(
|
||||||
opts.parent, opts.tunnel, opts.server, int(opts.depth))
|
opts.parent, opts.tunnel, opts.server, depth, WormConfiguration.dropper_target_path)
|
||||||
|
|
||||||
monkey_cmdline = DROPPER_CMDLINE_WINDOWS % {
|
monkey_cmdline = DROPPER_CMDLINE_WINDOWS % {
|
||||||
'monkey_path': WormConfiguration.dropper_target_path} + monkey_options
|
'dropper_path': WormConfiguration.dropper_upgrade_win_64_temp_path} + monkey_options
|
||||||
monkey_process = os.subprocess.Popen(monkey_cmdline, shell=True,
|
|
||||||
stdin=None, stdout=None, stderr=None,
|
|
||||||
close_fds=True, creationflags=DETACHED_PROCESS)
|
|
||||||
|
|
||||||
|
print monkey_cmdline
|
||||||
|
monkey_process = subprocess.Popen(monkey_cmdline, shell=True,
|
||||||
|
stdin=None, stdout=None, stderr=None,
|
||||||
|
close_fds=True, creationflags=DETACHED_PROCESS)
|
||||||
|
|
Loading…
Reference in New Issue