[Gaim-commits] CVS: gaim gaim-installer.nsi,1.4,1.5

[Herman B. <her...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv7835

Modified Files:
	gaim-installer.nsi 
Log Message:
A check to see if Gaim is already installed

Index: gaim-installer.nsi
===================================================================
RCS file: /cvsroot/gaim/gaim/gaim-installer.nsi,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gaim-installer.nsi	2 Nov 2002 03:50:20 -0000	1.4
+++ gaim-installer.nsi	3 Nov 2002 23:36:22 -0000	1.5
@@ -7,6 +7,7 @@
 Name "Gaim 0.60 alpha 3 (Win32)"
 OutFile "gaim-0.60-alpha3.exe"
 Icon .\pixmaps\gaim-install.ico
+UninstallIcon .\pixmaps\gaim-install.ico
 
 ; Some default compiler settings (uncomment and change at will):
 ; SetCompress auto ; (can be off or force)
@@ -22,6 +23,19 @@
 DirText "Select the directory to install Gaim in:"
 
 Section "" ; (default section)
+  ; Check if previous intallation exists
+  ReadRegStr $R0 HKEY_LOCAL_MACHINE "SOFTWARE\gaim" ""
+  StrCmp $R0 "" cont_install
+    ReadRegStr $R1 HKEY_LOCAL_MACHINE "SOFTWARE\gaim" "Version"
+    StrCmp $R1 "" no_version
+      ; Gaim found, so exit Intallation
+      MessageBox MB_OK "Gaim v$R1 has already been installed. If you wish to install a new version, uninstall first." IDOK
+      Quit
+      no_version: 
+      MessageBox MB_OK "Gaim has already been installed on your machine. If you wish to install a new version, uninstall first." IDOK
+      Quit
+  cont_install:
+
   ; Install Aspell
   SetOutPath "$INSTDIR"
   File ..\win32-dev\aspell-15\bin\aspell-0.50.2.exe
@@ -33,6 +47,7 @@
 
   ; Gaim Registry Settings
   WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Gaim" "" "$INSTDIR"
+  WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Gaim" "Version" "0.60a3"
   WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gaim" "DisplayName" "Gaim (remove only)"
   WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gaim" "UninstallString" '"$INSTDIR\gaim-uninst.exe"'
   ; Set App path to include aspell dir