[pkg-otr-team] [irssi-plugin-otr] 143/167: Modifications to the nsi file to make it work properly in a UI-less setting.

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to tag 4.0.0
in repository irssi-plugin-otr.

commit 313ab6e48bb9f441aa2923e5a101341cf6996485
Author: Ian Goldberg <iang at cs.uwaterloo.ca>
Date:   Thu Aug 16 21:44:30 2012 -0400

    Modifications to the nsi file to make it work properly in a UI-less setting.
    
    Thanks to Ariel Poliak <ariel.p at hostdime.com> for the patch!
---
 ChangeLog                        |  6 ++++++
 packaging/windows/pidgin-otr.nsi | 27 +++++++++++++++------------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b532590..ebc93bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-16
+
+	* packaging/windows/pidgin-otr.nsi: Modifications to the nsi
+	file to make it work properly in a UI-less setting.  Thanks to
+	Ariel Poliak <ariel.p at hostdime.com> for the patch!
+
 2012-07-19
 
 	* gtk-dialog.c, gtk-ui.c, otr-plugin.c: Clean up compiler warnings,
diff --git a/packaging/windows/pidgin-otr.nsi b/packaging/windows/pidgin-otr.nsi
index 7440d88..9c9eb5a 100644
--- a/packaging/windows/pidgin-otr.nsi
+++ b/packaging/windows/pidgin-otr.nsi
@@ -119,16 +119,15 @@ Section -Post
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
- 
 SectionEnd
 
 Function un.onUninstSuccess
   HideWindow
-  MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer."
+	MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer." /SD IDOK 
 FunctionEnd
 
 Function un.onInit
-  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2
+	MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" /SD IDYES IDYES +2
   Abort
 FunctionEnd
 
@@ -160,7 +159,7 @@ Section Uninstall
 	IfFileExists "$PidginDir\plugins\pidgin-otr.dll" dodelete
   ReadRegStr $PidginDir HKCU Software\Pidgin-otr "pidgindir"
 	IfFileExists "$PidginDir\plugins\pidgin-otr.dll" dodelete
-  MessageBox MB_OK|MB_ICONINFORMATION "Could not find pidgin plugin directory, pidgin-otr.dll not uninstalled!" IDOK ok
+	MessageBox MB_OK|MB_ICONINFORMATION "Could not find pidgin plugin directory, pidgin-otr.dll not uninstalled!" /SD IDOK IDOK ok
 dodelete:
 	Delete "$PidginDir\plugins\pidgin-otr.dll"
 
@@ -178,7 +177,7 @@ dodelete:
 	Pop $0
 	
 	IfFileExists "$PidginDir\plugins\pidgin-otr.dll" 0 +2
-		MessageBox MB_OK|MB_ICONINFORMATION "pidgin-otr.dll is busy. Probably Pidgin is still running. Please delete $PidginDir\plugins\pidgin-otr.dll manually."
+		MessageBox MB_OK|MB_ICONINFORMATION "pidgin-otr.dll is busy. Probably Pidgin is still running. Please delete $PidginDir\plugins\pidgin-otr.dll manually." /SD IDOK
 
   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "SOFTWARE\pidgin-otr\pidgindir"
@@ -192,11 +191,11 @@ Function GetPidginInstPath
 	IfFileExists "$0\pidgin.exe" cont
 	ReadRegStr $0 HKCU "Software\pidgin" ""
 	IfFileExists "$0\pidgin.exe" cont
-  MessageBox MB_OK|MB_ICONINFORMATION "Failed to find Pidgin installation."
+		MessageBox MB_OK|MB_ICONINFORMATION "Failed to find Pidgin installation." /SD IDOK
 		Abort "Failed to find Pidgin installation. Please install Pidgin first."
 cont:
 	StrCpy $PidginDir $0
-	;MessageBox MB_OK|MB_ICONINFORMATION "Pidgin plugin directory found at $PidginDir\plugins ."
+	;MessageBox MB_OK|MB_ICONINFORMATION "Pidgin plugin directory found at $PidginDir\plugins ." /SD IDOK
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "SOFTWARE\pidgin-otr" "pidgindir" "$PidginDir"
 FunctionEnd
 
@@ -205,21 +204,25 @@ Function UnInstOld
 	  ReadRegStr $0 ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString"
 		IfFileExists "$0" deinst cont
 	deinst:
-		MessageBox MB_OK|MB_ICONEXCLAMATION  "pidgin-otr was already found on your system and will first be uninstalled"
+		MessageBox MB_OK|MB_ICONEXCLAMATION  "pidgin-otr was already found on your system and will first be uninstalled" /SD IDOK
 		; the uninstaller copies itself to temp and execs itself there, so it can delete 
 		; everything including its own original file location. To prevent the installer and
 		; uninstaller racing you can't simply ExecWait.
 		; We hide the uninstall because otherwise it gets really confusing window-wise
 		;HideWindow
 		  ClearErrors
+		IfSilent olduninstsilent
 			ExecWait '"$0" _?=$INSTDIR'
 			IfErrors 0 cont
-				MessageBox MB_OK|MB_ICONEXCLAMATION  "Uninstall failed or aborted"
+			MessageBox MB_OK|MB_ICONEXCLAMATION  "Uninstall failed or aborted" /SD IDOK
+			Abort "Uninstalling of the previous version gave an error. Install aborted."
+olduninstsilent:
+		ExecWait '"$0" /S _?=$INSTDIR'
+		IfErrors 0 cont
 				Abort "Uninstalling of the previous version gave an error. Install aborted."
-			
 		;BringToFront
 	cont:
-		;MessageBox MB_OK|MB_ICONINFORMATION "No old pidgin-otr found, continuing."
+		;MessageBox MB_OK|MB_ICONINFORMATION "No old pidgin-otr found, continuing." /SD IDOK
 		
 FunctionEnd
 
@@ -236,7 +239,7 @@ Rename "$INSTDIR\pidgin-otr.dll" "$PidginDir\plugins\pidgin-otr.dll"
 IfErrors dllbusy
 	Return
 dllbusy:
-	MessageBox MB_RETRYCANCEL "pidgin-otr.dll is busy. Please close Pidgin (including tray icon) and try again" IDCANCEL cancel
+	MessageBox MB_RETRYCANCEL "pidgin-otr.dll is busy. Please close Pidgin (including tray icon) and try again" /SD IDCANCEL IDCANCEL cancel
 	Delete "$PidginDir\plugins\pidgin-otr.dll"
 	Goto copy
 	Return

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-otr/packages/irssi-plugin-otr.git