# HG changeset patch
# User Herman Bloggs <hermanator12002@yahoo.com>
# Date 1036722087 0
# Node ID 29ccbc3eb9c1907bcb20f0c8bdb9b14905df48c6
# Parent  290d7edcaa093bda69d06c1263bec9cf98ba16f6
[gaim-migrate @ 4076]
improvements

committer: Tailor Script <tailor@pidgin.im>

diff -r 290d7edcaa09 -r 29ccbc3eb9c1 gaim-installer.nsi
--- a/gaim-installer.nsi	Thu Nov 07 18:10:04 2002 +0000
+++ b/gaim-installer.nsi	Fri Nov 08 02:21:27 2002 +0000
@@ -1,8 +1,7 @@
 ; Installer script for win32 Gaim
-; Generated NSIS script file (generated by makensitemplate.phtml 0.21)
-; Herman on Sep 11 02 @ 21:52
+; Herman Bloggs <hermanator12002@yahoo.com>
 
-; NOTE: this .NSI script is designed for NSIS v1.8+
+; NOTE: this .NSI script is designed for NSIS v2.0b0+
 
 Name "Gaim 0.60 alpha 3 (Win32)"
 OutFile "gaim-0.60-alpha3.exe"
@@ -29,24 +28,24 @@
     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
+      MessageBox MB_OK "Gaim (v$R1) already exists on this machine. Uninstall first then try again." 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
+      MessageBox MB_OK "Gaim already exists on this machine. Uninstall first then try again." IDOK
       Quit
   cont_install:
-
   ; Install Aspell
   SetOutPath "$INSTDIR"
   File ..\win32-dev\aspell-15\bin\aspell-0.50.2.exe
-  ExecWait "$INSTDIR\aspell-0.50.2.exe" $R0
-  ; Check if user canceled aspell installation
-  StrCmp $R0 "0" no_exit
-    MessageBox MB_OK "Gaim can not be installed without first installing Aspell." IDOK
+  ExecWait '"$INSTDIR\aspell-0.50.2.exe" /S' $R0
+  ; cleanup aspell installer file
+  Delete "$INSTDIR\aspell-0.50.2.exe"
+  ; Check if aspell installer completed ok
+  StrCmp $R0 "0" have_aspell
+    ; Aspell exited uncleanly so we will exit uncleanly too.
     RMDir /r "$INSTDIR"
     Quit
-  no_exit:
-
+  have_aspell:
   SetOutPath "$INSTDIR"
   ; Gaim files
   File /r .\win32-install-dir\*.*
@@ -80,9 +79,6 @@
 
   ; write out uninstaller
   WriteUninstaller "$INSTDIR\gaim-uninst.exe"
-
-  ; cleanup aspell installer file
-  Delete "$INSTDIR\aspell-0.50.2.exe"
 SectionEnd ; end of default section
 
 ; begin uninstall settings/section