Browse Source

fix bug 1824420 port

Bill Gianopoulos 1 year ago
parent
commit
6c24d2ea76

+ 4 - 5
comm-central/patches/WIP-9999999-port1824420-suite-bustage.patch

@@ -17,7 +17,7 @@ diff --git a/suite/installer/windows/nsis/installer.nsi b/suite/installer/window
  !insertmacro CheckForFilesInUse
  !insertmacro CheckForFilesInUse
  !insertmacro CheckIfRegistryKeyExists
  !insertmacro CheckIfRegistryKeyExists
 -!insertmacro CleanUpdateDirectories
 -!insertmacro CleanUpdateDirectories
-+!insertmacro CleanMantenanceServiceLogs
++!insertmacro CleanMaintenanceServiceLogs
  !insertmacro CopyFilesFromDir
  !insertmacro CopyFilesFromDir
  !insertmacro CreateRegKey
  !insertmacro CreateRegKey
  !insertmacro FindSMProgramsDir
  !insertmacro FindSMProgramsDir
@@ -26,7 +26,7 @@ diff --git a/suite/installer/windows/nsis/installer.nsi b/suite/installer/window
  !insertmacro InitHashAppModelId
  !insertmacro InitHashAppModelId
  !insertmacro IsHandlerForInstallDir
  !insertmacro IsHandlerForInstallDir
  !insertmacro ManualCloseAppPrompt
  !insertmacro ManualCloseAppPrompt
-@@ -195,17 +195,17 @@ Section "-InstallStartCleanup"
+@@ -195,17 +195,14 @@ Section "-InstallStartCleanup"
      ${DeleteFile} "$INSTDIR\${FileMainEXE}"
      ${DeleteFile} "$INSTDIR\${FileMainEXE}"
      ClearErrors
      ClearErrors
    ${EndIf}
    ${EndIf}
@@ -34,10 +34,9 @@ diff --git a/suite/installer/windows/nsis/installer.nsi b/suite/installer/window
    ; setup the application model id registration value
    ; setup the application model id registration value
    ${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
    ${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
  
  
-   ; Remove the updates directory for Windows 7 and above
+-  ; Remove the updates directory for Windows 7 and above
 -  ${CleanUpdateDirectories} "Mozilla\SeaMonkey" "Mozilla\updates"
 -  ${CleanUpdateDirectories} "Mozilla\SeaMonkey" "Mozilla\updates"
-+  ${CleanMaintenanceServiceLogs) "Mozilla\SeaMonkey"
- 
+-
    ${RemoveDeprecatedFiles}
    ${RemoveDeprecatedFiles}
  
  
    ${InstallStartCleanupCommon}
    ${InstallStartCleanupCommon}