1.1 --- a/OpenSecurity.iss	Mon Mar 03 15:05:17 2014 +0100
     1.2 +++ b/OpenSecurity.iss	Tue Mar 04 16:54:51 2014 +0100
     1.3 @@ -8,12 +8,12 @@
     1.4  AppContact=AIT Austrian Institute of Technology
     1.5  AppPublisher=AIT Austrian Institute of Technology
     1.6  AppPublisherURL=http://www.ait.ac.at/
     1.7 -AppVersion=0.1
     1.8 +AppVersion=0.2
     1.9  ArchitecturesInstallIn64BitMode=x64
    1.10  DefaultDirName={pf}\OpenSecurity
    1.11  DefaultGroupName=OpenSecurity
    1.12  OutputDir="."
    1.13 -OutputBaseFilename="OpenSecurity Setup V0.1"
    1.14 +OutputBaseFilename="OpenSecurity Setup V0.2"
    1.15  OutputManifestFile=OpenSecurity-Setup-Manifest.txt
    1.16  SetupIconFile=OpenSecurity\gfx\OpenSecurity.ico
    1.17  SolidCompression=yes
    1.18 @@ -33,23 +33,27 @@
    1.19  
    1.20  [Registry]
    1.21  ; Registry entries to set
    1.22 -;Root: HKCU; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Run"; ValueName: "OpenSecurity Daemon"; ValueType: string; ValueData: "{app}\python27\pythonw.exe ""{app}\bin\opensecurityd.pyw"""; Flags: uninsdeletevalue
    1.23  Root: HKCU; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Run"; ValueName: "OpenSecurity Tray Icon"; ValueType: string; ValueData: "{app}\python27\pythonw.exe ""{app}\bin\opensecurity_tray.pyw"""; Flags: uninsdeletevalue
    1.24  
    1.25  [Icons]
    1.26  ; Program Icons in start menu
    1.27  Name: "{group}\OpenSecurity Initial VM"; Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\download-image.pyw"""; WorkingDir: "{app}"; Comment: "Download and install the initial OpenSecurity VM image"; IconFilename: "{app}\gfx\OpenSecurity.ico"
    1.28  Name: "{group}\OpenSecurity Tray Icon"; Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurity_tray.pyw"""; WorkingDir: "{userappdata}"; Comment: "The OpenSecurity Tray Icon"; IconFilename: "{app}\gfx\OpenSecurity.ico"
    1.29 -;Name: "{group}\OpenSecurity Server"; Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurityd.pyw"""; WorkingDir: "{userappdata}"; Comment: "The OpenSecurity VM System Orchestrating Server"; IconFilename: "{app}\gfx\OpenSecurity.ico"
    1.30 -;Name: "{group}\Initial VM import"; Filename: "{app}\install\initial_vm.bat"; WorkingDir: "{userappdata}"; Comment: "The OpenSecurity VM System Orchestrating Server"; IconFilename: "{app}\gfx\OpenSecurity.ico"
    1.31 +Name: "{group}\Initial VM import"; Filename: "{app}\cygwin64\bin\bash.exe"; Parameters: "-i -l /OpenSecurity/install/initial_vm.sh"; WorkingDir: "{app}"; Comment: "Import the initial OpenSecurity VM"; IconFilename: "{app}\gfx\OpenSecurity.ico"
    1.32  Name: "{group}\Uninstall OpenSecurity"; Filename: "{uninstallexe}"
    1.33  
    1.34  [Run]
    1.35  ; Run after installment
    1.36  Filename: "{app}\cygwin64\bin\dash.exe"; Parameters: "/bin/rebaseall"; Description: "Rebasing background system"; WorkingDir: "{app}"; StatusMsg: "Rebasing background system..."; Flags: runascurrentuser
    1.37  Filename: "{app}\install\fix_cygwin_paths.bat"; Description: "Fixing Cygwin paths"; WorkingDir: "{app}\install"; StatusMsg: "Fixing Cygwin Paths..";
    1.38 -;Filename: "{app}\install\initial_vm.bat"; Description: "Loading initial VM"; WorkingDir: "{app}\install"; StatusMsg: "Setting up initial VM..."; Flags: runasoriginaluser
    1.39 -Filename: "{app}\python27\pythonw.exe"; Parameters: "{app}\bin\opensecurity_service.pyw install"; Description: "Installing the OpenSecurity Service"; WorkingDir: "{app}"; StatusMsg: "Installing the OpenSecurity Service";
    1.40 +Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurity_service.pyw"" --startup auto install"; Description: "Installing the OpenSecurity Service"; WorkingDir: "{app}"; StatusMsg: "Installing the OpenSecurity Service"; Flags: runascurrentuser
    1.41 +Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\download-image.pyw"""; WorkingDir: "{app}"; Description: "Download and install the initial OpenSecurity VM image"; Flags: postinstall runascurrentuser
    1.42 +Filename: "{app}\cygwin64\bin\bash.exe"; Parameters: "-i -l /OpenSecurity/install/initial_vm.sh"; WorkingDir: "{app}"; Description: "Import the initial OpenSecurity VM"; Flags: postinstall runascurrentuser
    1.43 +                
    1.44 +[UninstallRun]
    1.45 +; When uninstalling run this command prior
    1.46 +Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurity_service.pyw"" stop"; WorkingDir: "{app}"; StatusMsg: "Stopping the OpenSecurity Service"; Flags: runascurrentuser
    1.47 +Filename: "{app}\python27\pythonw.exe"; Parameters: """{app}\bin\opensecurity_service.pyw"" remove"; WorkingDir: "{app}"; StatusMsg: "Removing the OpenSecurity Service"; Flags: runascurrentuser
    1.48  
    1.49  [UninstallDelete]
    1.50  Type: filesandordirs; Name: "{app}"