[ossec-cvs] ossec-hids: make.bat (HEAD) ossec-installer.nsi (HEAD) setup-win.c (HEAD) [dcid]

[OSSEC CVS <cvs-commit@xxxxxxxxx>]

Module name:	ossec-hids
Changes by:	dcid	07/07/11 20:27:32

Modified files:
	make.bat ossec-installer.nsi setup-win.c

Log message:
Description: Few fixes to the installer to call the new ui.
Reviewed by: dcid
Bug:

Index: make.bat
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/win32/make.bat,v
diff -u -r1.16 -r1.17
--- make.bat	18 Apr 2007 02:04:59 -0000	1.16
+++ make.bat	11 Jul 2007 23:27:31 -0000	1.17
@@ -9,3 +9,5 @@
 "C:\MinGW\bin\gcc.exe" -o service-stop -Wall os_regex/*.c setup/service-stop.c -I./
 "C:\MinGW\bin\gcc.exe" -o setup-iis -Wall os_regex/*.c setup/setup-iis.c -I./
 "C:\MinGW\bin\gcc.exe" -o add-localfile -Wall os_regex/*.c setup/add-localfile.c -I./
+cd ui\
+make

Index: ossec-installer.nsi
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/win32/ossec-installer.nsi,v
diff -u -r1.28 -r1.29
--- ossec-installer.nsi	11 Jul 2007 04:26:59 -0000	1.28
+++ ossec-installer.nsi	11 Jul 2007 23:27:31 -0000	1.29
@@ -6,7 +6,7 @@
 ;--------------------------------
 ;General
 
-!define VERSION "1.2"
+!define VERSION "1.3"
 !define NAME "Ossec HIDS"
 !define /date CDATE "%b %d %Y at %H:%M:%S"
 
@@ -65,7 +65,7 @@
 
 ClearErrors
 
-File ossec-agent.exe default-ossec.conf manage_agents.exe internal_options.conf setup-windows.exe setup-iis.exe service-start.exe service-stop.exe doc.html rootkit_trojans.txt rootkit_files.txt add-localfile.exe LICENSE.txt
+File ossec-agent.exe default-ossec.conf manage_agents.exe os_win32ui.exe internal_options.conf setup-windows.exe setup-iis.exe service-start.exe service-stop.exe doc.html rootkit_trojans.txt rootkit_files.txt add-localfile.exe LICENSE.txt
 WriteRegStr HKLM SOFTWARE\ossec "Install_Dir" "$INSTDIR"
 
 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\ossec" "DisplayName" "OSSEC Hids Agent"
@@ -95,16 +95,13 @@
 CreateShortCut "$SMPROGRAMS\ossec\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
 CreateShortCut "$SMPROGRAMS\ossec\Edit Config.lnk" "$INSTDIR\ossec.conf" "" "$INSTDIR\ossec.conf" 0
 CreateShortCut "$SMPROGRAMS\ossec\Documentation.lnk" "$INSTDIR\doc.html" "" "$INSTDIR\doc.html" 0
-CreateShortCut "$SMPROGRAMS\ossec\Start OSSEC.lnk" "$INSTDIR\service-start.exe" "" "$INSTDIR\service-start.exe" 0
-CreateShortCut "$SMPROGRAMS\ossec\Stop OSSEC.lnk" "$INSTDIR\service-stop.exe" "" "$INSTDIR\service-stop.exe" 0
-CreateShortCut "$SMPROGRAMS\ossec\Import Keys.lnk" "$INSTDIR\manage_agents.exe" "" "$INSTDIR\manage_agents.exe" 0
-CreateShortCut "$SMPROGRAMS\ossec\View Logs.lnk" "$INSTDIR\ossec.log" "" "$INSTDIR\ossec.log" 0
+CreateShortCut "$SMPROGRAMS\ossec\Manage Agent.lnk" "$INSTDIR\os_win32ui.exe" "" "$INSTDIR\os_win32ui.exe" 0
 
 
 ; Install in the services 
 ExecWait '"$INSTDIR\ossec-agent.exe" install-service'
 ExecWait '"$INSTDIR\setup-windows.exe" "$INSTDIR"' 
-ExecWait '"C:\Windows\notepad.exe" "$INSTDIR\ossec.conf"'
+ExecWait '"$INSTDIR\os_win32ui.exe" "$INSTDIR"' 
 
 MessageBox MB_OKCANCEL "Do you wish to start ${NAME} now?" IDCANCEL NoStartsvc
     ;; Starting ossec service.

Index: setup-win.c
===================================================================
RCS file: /usr/cvsroot/ossec-hids/src/win32/setup-win.c,v
diff -u -r1.33 -r1.34
--- setup-win.c	18 Feb 2007 03:42:43 -0000	1.33
+++ setup-win.c	11 Jul 2007 23:27:31 -0000	1.34
@@ -378,11 +378,6 @@
         snprintf(cmd, OS_MAXSTR, "setup-iis.exe .");
         system(cmd);
 
-
-        /* Run manage agents */
-        printf("\n\nSetting up Authentication keys...\n\n");
-        snprintf(cmd, OS_MAXSTR, "manage_agents.exe");
-        system(cmd);
     }
 
     /* If it is present, we need to do the upgrade */