fix download and init_template script lookup
authorOliver Maurhart <oliver.maurhart@ait.ac.at>
Fri, 16 May 2014 10:04:11 +0200
changeset 153ef0ace8dfc97
parent 152 028c3055147f
child 154 651bf8fd169e
fix download and init_template script lookup
OpenSecurity/bin/initial_vm.sh
OpenSecurity/bin/opensecurityd.pyw
     1.1 --- a/OpenSecurity/bin/initial_vm.sh	Thu May 15 09:19:09 2014 +0100
     1.2 +++ b/OpenSecurity/bin/initial_vm.sh	Fri May 16 10:04:11 2014 +0200
     1.3 @@ -158,3 +158,7 @@
     1.4  net start "OpenSecurity Service"
     1.5  echo "OpenSecurity service started"
     1.6  
     1.7 +# run 1st update on image
     1.8 +sleep 1
     1.9 +wget -q http://localhost:8080/update_template
    1.10 +
     2.1 --- a/OpenSecurity/bin/opensecurityd.pyw	Thu May 15 09:19:09 2014 +0100
     2.2 +++ b/OpenSecurity/bin/opensecurityd.pyw	Fri May 16 10:04:11 2014 +0200
     2.3 @@ -123,8 +123,8 @@
     2.4          trace_file = open(trace_file_name, 'w+')
     2.5  
     2.6          machine_folder = Cygwin.cygPath(gvm_mgr.getMachineFolder()) 
     2.7 -        download_initial_image_script = '/OpenSecurity/bin/download_initial_image.sh \'' + machine_folder + '\''
     2.8 -        Cygwin.bashExecute(download_initial_image_script, wait_return = False, stdout = trace_file, stderr = trace_file) 
     2.9 +        download_initial_image_script = Cygwin.cygPath(os.path.abspath(os.path.join(os.path.split(__file__)[0], 'download_initial_image.sh')))
    2.10 +        Cygwin.bashExecute(download_initial_image_script + ' \'' + machine_folder + '\'', wait_return = False, stdout = trace_file, stderr = trace_file) 
    2.11  
    2.12          res = '{ "fetch_log": "' + trace_file_name.replace('\\', '\\\\') + '" }'
    2.13          return res
    2.14 @@ -144,8 +144,8 @@
    2.15          trace_file = open(trace_file_name, 'w+')
    2.16  
    2.17          vm_image = Cygwin.cygPath(gvm_mgr.getMachineFolder()) + '/OsecVM.ova'
    2.18 -        initial_import_script = '/OpenSecurity/bin/initial_vm.sh \'' + vm_image + '\''
    2.19 -        Cygwin.bashExecute(initial_import_script, wait_return = False, stdout = trace_file, stderr = trace_file) 
    2.20 +        initial_import_script = Cygwin.cygPath(os.path.abspath(os.path.join(os.path.split(__file__)[0], 'initial_vm.sh')))
    2.21 +        Cygwin.bashExecute(initial_import_script + ' \'' + vm_image + '\'', wait_return = False, stdout = trace_file, stderr = trace_file) 
    2.22  
    2.23          res = '{ "init_log": "' + trace_file_name.replace('\\', '\\\\') + '" }'
    2.24          return res