1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/OpenSecurity.iss	Tue Feb 18 16:06:07 2014 +0100
     1.3 @@ -0,0 +1,28 @@
     1.4 +; -- OpenSecurity.iss --
     1.5 +; OpenSecurity setup file for use with
     1.6 +; Inno Setup Compiler (http://www.jrsoftware.org/isinfo.php) 
     1.7 +
     1.8 +[Setup]
     1.9 +AppName=OpenSecurity
    1.10 +AppPublisher=AIT Austrian Institute of Technology
    1.11 +AppPublisherURL=http://www.ait.ac.at/
    1.12 +AppVersion=0.1
    1.13 +ArchitecturesInstallIn64BitMode=x64
    1.14 +DefaultDirName={pf}\OpenSecurity
    1.15 +OutputDir="."
    1.16 +OutputBaseFilename="OpenSecurity Setup V0.1"
    1.17 +OutputManifestFile=OpenSecurity-Setup-Manifest.txt
    1.18 +SetupIconFile=OpenSecurity\gfx\OpenSecurity.ico
    1.19 +SolidCompression=yes
    1.20 +UninstallDisplayIcon={app}\gfx\OpenSecurity.ico
    1.21 +
    1.22 +[Files]
    1.23 +Source: "OpenSecurity\bin\*"; Excludes: "*.pyc"; DestDir: "{app}\bin"; Flags: recursesubdirs;
    1.24 +Source: "OpenSecurity\cygwin64\*"; DestDir: "{app}\cygwin64"; Flags: recursesubdirs;
    1.25 +Source: "OpenSecurity\gfx\*"; DestDir: "{app}\gfx"; Flags: recursesubdirs;
    1.26 +Source: "OpenSecurity\install\*"; DestDir: "{app}\install"; Flags: recursesubdirs;
    1.27 +Source: "OpenSecurity\python27\*"; DestDir: "{app}\python27"; Flags: recursesubdirs;
    1.28 +
    1.29 +[Run]
    1.30 +;Filename: "{app}\install\cygwin_rebase.bat"; Description: "Fixing Cygwin64 DLL paths"; WorkingDir: "{app}\install"; StatusMsg: "Relocating Cygwin64..."
    1.31 +Filename: "{app}\install\initial_vm.bat"; Description: "Loading initial VM"; WorkingDir: "{app}\install"; StatusMsg: "Setting up initial VM..."; Flags: runasoriginaluser

     2.1 --- a/OpenSecurity/install/initial_vm.bat	Tue Feb 18 14:00:16 2014 +0100
     2.2 +++ b/OpenSecurity/install/initial_vm.bat	Tue Feb 18 16:06:07 2014 +0100
     2.3 @@ -2,7 +2,6 @@
     2.4  
     2.5  cd "%0%\.."
     2.6  SET WGET="%0%\..\..\cygwin64\bin\wget.exe"
     2.7 -SET BASH="%0%\..\..\cygwin64\bin\bash.exe"
     2.8  SET OS_ADMIN_PORT=8080
     2.9  
    2.10  rem ------------------------------------------------------------
    2.11 @@ -43,10 +42,12 @@
    2.12  SET VBP=%HOMEDRIVE%%HOMEPATH%\VirtualBox VMs
    2.13  IF NOT EXIST "%VBP%" MKDIR "%VBP%"
    2.14  
    2.15 -
    2.16  :DOWNLOAD_TEMPLATE_VM
    2.17  rem Download the OSec.ova template from the X-Net servers
    2.18  
    2.19 +echo %CD%
    2.20 +PAUSE
    2.21 +
    2.22  IF EXIST OsecVM.ova GOTO COPY_TEMPLATE_VM
    2.23  echo "download initial OpenSecurity VM"
    2.24  "%WGET%" %OVA_TEMPLATE_URL%
    2.25 @@ -57,7 +58,7 @@
    2.26  echo "copying template VM into Virtual Box's realm"
    2.27  %HOMEDRIVE%
    2.28  cd "%VBP%"
    2.29 -COPY "%0%\..\OSecVM.ova" .
    2.30 +COPY %0%\..\OSecVM.ova .
    2.31  
    2.32  
    2.33  :IMPORT_TEMPLATE_VM
    2.34 @@ -74,11 +75,11 @@
    2.35  rem we have imported the Template
    2.36  rem now, we need to update the template before first use
    2.37  
    2.38 -cd "%0%\..\.."
    2.39 +cd %0%\..\..
    2.40  SET PATH=%CD%\python27;%PATH%
    2.41 -START python27\pythonw bin\opensecurityd.pyw
    2.42 +CMD /C python27\python bin\opensecurityd.pyw
    2.43  echo Waiting for OpenSecurity Amdin Daemon to start
    2.44 -%BASH% -c -l "for i in $(seq 0 4); do echo -n '.'; sleep 1; done; echo"
    2.45 +PAUSE
    2.46  rem trigger update
    2.47  %WGET% http://localhost:%OS_ADMIN_PORT%/update_template
    2.48  GOTO END