1.1 --- a/OpenSecurity/bin/opensecurityd.pyw Tue May 13 12:55:50 2014 +0200
1.2 +++ b/OpenSecurity/bin/opensecurityd.pyw Fri May 16 10:04:11 2014 +0200
1.3 @@ -123,8 +123,8 @@
1.4 trace_file = open(trace_file_name, 'w+')
1.5
1.6 machine_folder = Cygwin.cygPath(gvm_mgr.getMachineFolder())
1.7 - download_initial_image_script = '/OpenSecurity/bin/download_initial_image.sh \'' + machine_folder + '\''
1.8 - Cygwin.bashExecute(download_initial_image_script, wait_return = False, stdout = trace_file, stderr = trace_file)
1.9 + download_initial_image_script = Cygwin.cygPath(os.path.abspath(os.path.join(os.path.split(__file__)[0], 'download_initial_image.sh')))
1.10 + Cygwin.bashExecute(download_initial_image_script + ' \'' + machine_folder + '\'', wait_return = False, stdout = trace_file, stderr = trace_file)
1.11
1.12 res = '{ "fetch_log": "' + trace_file_name.replace('\\', '\\\\') + '" }'
1.13 return res
1.14 @@ -144,8 +144,8 @@
1.15 trace_file = open(trace_file_name, 'w+')
1.16
1.17 vm_image = Cygwin.cygPath(gvm_mgr.getMachineFolder()) + '/OsecVM.ova'
1.18 - initial_import_script = '/OpenSecurity/bin/initial_vm.sh \'' + vm_image + '\''
1.19 - Cygwin.bashExecute(initial_import_script, wait_return = False, stdout = trace_file, stderr = trace_file)
1.20 + initial_import_script = Cygwin.cygPath(os.path.abspath(os.path.join(os.path.split(__file__)[0], 'initial_vm.sh')))
1.21 + Cygwin.bashExecute(initial_import_script + ' \'' + vm_image + '\'', wait_return = False, stdout = trace_file, stderr = trace_file)
1.22
1.23 res = '{ "init_log": "' + trace_file_name.replace('\\', '\\\\') + '" }'
1.24 return res