bug 757978. Remove empty "webapprt\components" subdir from Firefox installations. r=rstrong
authorTim Abraldes <tabraldes@mozilla.com>
Mon, 27 Aug 2012 16:18:54 -0700
changeset 105663 cc8bc4e1bdfcaab199e7eb733de0c3bba0d261a8
parent 105662 1fa9e807f7f8e9ef9d27446dca81c181751ac716
child 105664 d65863fbb129f3403d80fba6a508e5558f42509f
push id55
push usershu@rfrn.org
push dateThu, 30 Aug 2012 01:33:09 +0000
reviewersrstrong
bugs757978
milestone18.0a1
bug 757978. Remove empty "webapprt\components" subdir from Firefox installations. r=rstrong
browser/installer/windows/nsis/uninstaller.nsi
--- a/browser/installer/windows/nsis/uninstaller.nsi
+++ b/browser/installer/windows/nsis/uninstaller.nsi
@@ -373,16 +373,21 @@ Section "Uninstall"
 
   ; Parse the uninstall log to unregister dll's and remove all installed
   ; files / directories this install is responsible for.
   ${un.ParseUninstallLog}
 
   ; Remove the uninstall directory that we control
   RmDir /r /REBOOTOK "$INSTDIR\uninstall"
 
+  ; Explictly remove empty webapprt dir in case it exists
+  ; See bug 757978
+  RmDir "$INSTDIR\webapprt\components"
+  RmDir "$INSTDIR\webapprt"
+
   ; Remove the installation directory if it is empty
   ${RemoveDir} "$INSTDIR"
 
   ; If firefox.exe was successfully deleted yet we still need to restart to
   ; remove other files create a dummy firefox.exe.moz-delete to prevent the
   ; installer from allowing an install without restart when it is required
   ; to complete an uninstall.
   ${If} ${RebootFlag}