[MERGE] forward port of branch 7.0 up to revid 4067 chs@openerp.com-20131114142639...

[odoo/odoo.git] / setup.nsi

diff --git a/setup.nsi b/setup.nsi
index 92dcb9b..859ebdb 100644 (file)
--- a/setup.nsi
+++ b/setup.nsi
@@ -21,7 +21,7 @@
 #\r
 # You should have received a copy of the GNU General Public License\r
 # along with this program; if not, write to the Free Software\r
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\r
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA\r
 #####################################################################################\r
 \r
 !include 'MUI2.nsh'\r
@@ -172,6 +172,8 @@ Section OpenERP_Server SectionOpenERP_Server
 \r
     SetOutPath "$INSTDIR\service"\r
     File /r "win32\dist\*"\r
+    File "win32\start.bat"\r
+    File "win32\stop.bat"\r
 \r
     !insertmacro MUI_STARTMENU_WRITE_BEGIN Application\r
         ;Create shortcuts\r
@@ -289,9 +291,10 @@ Function .onInit
     !insertmacro MUI_LANGDLL_DISPLAY\r
 \r
     ClearErrors\r
-    EnumRegKey $0 HKLM "SOFTWARE\PostgreSQL" 0\r
+    EnumRegKey $0 HKLM "SOFTWARE\PostgreSQL\Installations" 0\r
     IfErrors DoInstallPostgreSQL 0\r
-        StrCpy $HasPostgreSQL 1\r
+    StrCmp $0 "" DoInstallPostgreSQL\r
+    StrCpy $HasPostgreSQL 1\r
 \r
     DoInstallPostgreSQL:\r
 FunctionEnd\r