projects
/
odoo
/
odoo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Forward port of branch 7.0 up to rev 8abd003
[odoo/odoo.git]
/
setup.nsi
diff --git
a/setup.nsi
b/setup.nsi
index
ab58915
..
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
#
\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
#####################################################################################
\r
\r
!include 'MUI2.nsh'
\r
@@
-291,9
+291,10
@@
Function .onInit
!insertmacro MUI_LANGDLL_DISPLAY
\r
\r
ClearErrors
\r
!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
IfErrors DoInstallPostgreSQL 0
\r
- StrCpy $HasPostgreSQL 1
\r
+ StrCmp $0 "" DoInstallPostgreSQL
\r
+ StrCpy $HasPostgreSQL 1
\r
\r
DoInstallPostgreSQL:
\r
FunctionEnd
\r
\r
DoInstallPostgreSQL:
\r
FunctionEnd
\r