Commit 313ab6e4 authored by Ian Goldberg's avatar Ian Goldberg
Browse files

Modifications to the nsi file to make it work properly in a UI-less setting.

Thanks to Ariel Poliak <ariel.p@hostdime.com> for the patch!
parent f6308372
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@hostdime.com> for the patch!
2012-07-19 2012-07-19
* gtk-dialog.c, gtk-ui.c, otr-plugin.c: Clean up compiler warnings, * gtk-dialog.c, gtk-ui.c, otr-plugin.c: Clean up compiler warnings,
......
...@@ -119,16 +119,15 @@ Section -Post ...@@ -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}" "DisplayVersion" "${PRODUCT_VERSION}"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
SectionEnd SectionEnd
Function un.onUninstSuccess Function un.onUninstSuccess
HideWindow 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 FunctionEnd
Function un.onInit 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 Abort
FunctionEnd FunctionEnd
...@@ -160,7 +159,7 @@ Section Uninstall ...@@ -160,7 +159,7 @@ Section Uninstall
IfFileExists "$PidginDir\plugins\pidgin-otr.dll" dodelete IfFileExists "$PidginDir\plugins\pidgin-otr.dll" dodelete
ReadRegStr $PidginDir HKCU Software\Pidgin-otr "pidgindir" ReadRegStr $PidginDir HKCU Software\Pidgin-otr "pidgindir"
IfFileExists "$PidginDir\plugins\pidgin-otr.dll" dodelete 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: dodelete:
Delete "$PidginDir\plugins\pidgin-otr.dll" Delete "$PidginDir\plugins\pidgin-otr.dll"
...@@ -178,7 +177,7 @@ dodelete: ...@@ -178,7 +177,7 @@ dodelete:
Pop $0 Pop $0
IfFileExists "$PidginDir\plugins\pidgin-otr.dll" 0 +2 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} "${PRODUCT_UNINST_KEY}"
DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "SOFTWARE\pidgin-otr\pidgindir" DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "SOFTWARE\pidgin-otr\pidgindir"
...@@ -192,11 +191,11 @@ Function GetPidginInstPath ...@@ -192,11 +191,11 @@ Function GetPidginInstPath
IfFileExists "$0\pidgin.exe" cont IfFileExists "$0\pidgin.exe" cont
ReadRegStr $0 HKCU "Software\pidgin" "" ReadRegStr $0 HKCU "Software\pidgin" ""
IfFileExists "$0\pidgin.exe" cont 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." Abort "Failed to find Pidgin installation. Please install Pidgin first."
cont: cont:
StrCpy $PidginDir $0 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" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "SOFTWARE\pidgin-otr" "pidgindir" "$PidginDir"
FunctionEnd FunctionEnd
...@@ -205,21 +204,25 @@ Function UnInstOld ...@@ -205,21 +204,25 @@ Function UnInstOld
ReadRegStr $0 ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" ReadRegStr $0 ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString"
IfFileExists "$0" deinst cont IfFileExists "$0" deinst cont
deinst: 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 ; 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 ; everything including its own original file location. To prevent the installer and
; uninstaller racing you can't simply ExecWait. ; uninstaller racing you can't simply ExecWait.
; We hide the uninstall because otherwise it gets really confusing window-wise ; We hide the uninstall because otherwise it gets really confusing window-wise
;HideWindow ;HideWindow
ClearErrors ClearErrors
IfSilent olduninstsilent
ExecWait '"$0" _?=$INSTDIR' ExecWait '"$0" _?=$INSTDIR'
IfErrors 0 cont 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." Abort "Uninstalling of the previous version gave an error. Install aborted."
;BringToFront ;BringToFront
cont: 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 FunctionEnd
...@@ -236,7 +239,7 @@ Rename "$INSTDIR\pidgin-otr.dll" "$PidginDir\plugins\pidgin-otr.dll" ...@@ -236,7 +239,7 @@ Rename "$INSTDIR\pidgin-otr.dll" "$PidginDir\plugins\pidgin-otr.dll"
IfErrors dllbusy IfErrors dllbusy
Return Return
dllbusy: 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" Delete "$PidginDir\plugins\pidgin-otr.dll"
Goto copy Goto copy
Return Return
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment