Commit fd96b762 authored by Matt Howell's avatar Matt Howell
Browse files

Bug 1413295 - Use BrandShortName as the title for new shortcuts, and rename... 

Bug 1413295 - Use BrandShortName as the title for new shortcuts, and rename existing shortcuts our installer created. r=rstrong

MozReview-Commit-ID: K4YvG5DZgqb

--HG--
extra : source : 324e11f297d7e4ced78f3402792e5fdcdf2abac1
parent 4250e26d

browser/installer/windows/nsis/installer.nsi

+20 −20
Original line number Diff line number Diff line
@@ -463,9 +463,9 @@ Section "-Application" APP_IDX 
  ; Always add the application's shortcuts to the shortcuts log ini file. The

  ; DeleteShortcuts macro will do the right thing on uninstall if the

  ; shortcuts don't exist.

  ${LogStartMenuShortcut} "${BrandFullName}.lnk"

  ${LogQuickLaunchShortcut} "${BrandFullName}.lnk"

  ${LogDesktopShortcut} "${BrandFullName}.lnk"

  ${LogStartMenuShortcut} "${BrandShortName}.lnk"

  ${LogQuickLaunchShortcut} "${BrandShortName}.lnk"

  ${LogDesktopShortcut} "${BrandShortName}.lnk"



  ; Best effort to update the Win7 taskbar and start menu shortcut app model

  ; id's. The possible contexts are current user / system and the user that
@@ -495,17 +495,17 @@ Section "-Application" APP_IDX 
  ; since this will either add it for the user if unelevated or All Users if

  ; elevated.

  ${If} $AddStartMenuSC == 1

    CreateShortCut "$SMPROGRAMS\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}"

    ${If} ${FileExists} "$SMPROGRAMS\${BrandFullName}.lnk"

      ShellLink::SetShortCutWorkingDirectory "$SMPROGRAMS\${BrandFullName}.lnk" \

    CreateShortCut "$SMPROGRAMS\${BrandShortName}.lnk" "$INSTDIR\${FileMainEXE}"

    ${If} ${FileExists} "$SMPROGRAMS\${BrandShortName}.lnk"

      ShellLink::SetShortCutWorkingDirectory "$SMPROGRAMS\${BrandShortName}.lnk" \

                                           "$INSTDIR"

      ${If} ${AtLeastWin7}

      ${AndIf} "$AppUserModelID" != ""

        ApplicationID::Set "$SMPROGRAMS\${BrandFullName}.lnk" "$AppUserModelID" "true"

        ApplicationID::Set "$SMPROGRAMS\${BrandShortName}.lnk" "$AppUserModelID" "true"

      ${EndIf}

      ${LogMsg} "Added Shortcut: $SMPROGRAMS\${BrandFullName}.lnk"

      ${LogMsg} "Added Shortcut: $SMPROGRAMS\${BrandShortName}.lnk"

    ${Else}

      ${LogMsg} "** ERROR Adding Shortcut: $SMPROGRAMS\${BrandFullName}.lnk"

      ${LogMsg} "** ERROR Adding Shortcut: $SMPROGRAMS\${BrandShortName}.lnk"

    ${EndIf}

  ${EndIf}
@@ -525,17 +525,17 @@ Section "-Application" APP_IDX 
  ${EndIf}



  ${If} $AddDesktopSC == 1

    CreateShortCut "$DESKTOP\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}"

    ${If} ${FileExists} "$DESKTOP\${BrandFullName}.lnk"

      ShellLink::SetShortCutWorkingDirectory "$DESKTOP\${BrandFullName}.lnk" \

    CreateShortCut "$DESKTOP\${BrandShortName}.lnk" "$INSTDIR\${FileMainEXE}"

    ${If} ${FileExists} "$DESKTOP\${BrandShortName}.lnk"

      ShellLink::SetShortCutWorkingDirectory "$DESKTOP\${BrandShortName}.lnk" \

                                             "$INSTDIR"

      ${If} ${AtLeastWin7}

      ${AndIf} "$AppUserModelID" != ""

        ApplicationID::Set "$DESKTOP\${BrandFullName}.lnk" "$AppUserModelID"  "true"

        ApplicationID::Set "$DESKTOP\${BrandShortName}.lnk" "$AppUserModelID"  "true"

      ${EndIf}

      ${LogMsg} "Added Shortcut: $DESKTOP\${BrandFullName}.lnk"

      ${LogMsg} "Added Shortcut: $DESKTOP\${BrandShortName}.lnk"

    ${Else}

      ${LogMsg} "** ERROR Adding Shortcut: $DESKTOP\${BrandFullName}.lnk"

      ${LogMsg} "** ERROR Adding Shortcut: $DESKTOP\${BrandShortName}.lnk"

    ${EndIf}

  ${EndIf}
@@ -548,12 +548,12 @@ Section "-Application" APP_IDX 
      ${GetOptions} "$0" "/UAC:" $0

      ${If} ${Errors}

        Call AddQuickLaunchShortcut

        ${LogMsg} "Added Shortcut: $QUICKLAUNCH\${BrandFullName}.lnk"

        ${LogMsg} "Added Shortcut: $QUICKLAUNCH\${BrandShortName}.lnk"

      ${Else}

        ; It is not possible to add a log entry from the unelevated process so

        ; add the log entry without the path since there is no simple way to

        ; know the correct full path.

        ${LogMsg} "Added Quick Launch Shortcut: ${BrandFullName}.lnk"

        ${LogMsg} "Added Quick Launch Shortcut: ${BrandShortName}.lnk"

        GetFunctionAddress $0 AddQuickLaunchShortcut

        UAC::ExecCodeSegment $0

      ${EndIf}
@@ -744,9 +744,9 @@ FunctionEnd 
# Helper Functions



Function AddQuickLaunchShortcut

  CreateShortCut "$QUICKLAUNCH\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}"

  ${If} ${FileExists} "$QUICKLAUNCH\${BrandFullName}.lnk"

    ShellLink::SetShortCutWorkingDirectory "$QUICKLAUNCH\${BrandFullName}.lnk" \

  CreateShortCut "$QUICKLAUNCH\${BrandShortName}.lnk" "$INSTDIR\${FileMainEXE}"

  ${If} ${FileExists} "$QUICKLAUNCH\${BrandShortName}.lnk"

    ShellLink::SetShortCutWorkingDirectory "$QUICKLAUNCH\${BrandShortName}.lnk" \

                                           "$INSTDIR"

  ${EndIf}

FunctionEnd

browser/installer/windows/nsis/shared.nsh

+80 −78
Original line number Diff line number Diff line
@@ -37,9 +37,6 @@ 
  ; setup the application model id registration value

  ${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"



  ; Win7 taskbar and start menu link maintenance

  Call FixShortcutAppModelIDs



  ClearErrors

  WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test"

  ${If} ${Errors}
@@ -54,9 +51,6 @@ 
    ${FixShellIconHandler} "HKLM"

    ${SetAppLSPCategories} ${LSP_CATEGORIES}



    ; Win7 taskbar and start menu link maintenance

    Call FixShortcutAppModelIDs



    ; Add the Firewall entries after an update

    Call AddFirewallEntries
@@ -70,25 +64,30 @@ 
  ; root of the Start Menu Programs directory.

  ${MigrateStartMenuShortcut}



  ; Update lastwritetime of the Start Menu shortcut to clear the tile cache.

  ; Adds a pinned Task Bar shortcut (see MigrateTaskBarShortcut for details).

  ${MigrateTaskBarShortcut}



  ; Update the name/icon/AppModelID of our shortcuts as needed, then update the

  ; lastwritetime of the Start Menu shortcut to clear the tile icon cache.

  ; Do this for both shell contexts in case the user has shortcuts in multiple

  ; locations, then restore the previous context at the end.

  ${If} ${AtLeastWin8}

  SetShellVarContext all

  ${UpdateShortcutBranding}

  ${If} ${AtLeastWin8}

    ${TouchStartMenuShortcut}

  ${EndIf}

  Call FixShortcutAppModelIDs

  SetShellVarContext current

  ${UpdateShortcutBranding}

  ${If} ${AtLeastWin8}

    ${TouchStartMenuShortcut}

  ${EndIf}

  Call FixShortcutAppModelIDs

  ${If} $TmpVal == "HKLM"

    SetShellVarContext all

  ${ElseIf} $TmpVal == "HKCU"

    SetShellVarContext current

  ${EndIf}

  ${EndIf}



  ; Adds a pinned Task Bar shortcut (see MigrateTaskBarShortcut for details).

  ${MigrateTaskBarShortcut}



  ${UpdateShortcutBranding}



  ${RemoveDeprecatedKeys}

  ${Set32to64DidMigrateReg}
@@ -165,10 +164,11 @@ 
!define PostUpdate "!insertmacro PostUpdate"



; Update the last modified time on the Start Menu shortcut, so that its icon

; gets refreshed. Should be called on Win8+ after MigrateStartMenuShortcut.

; gets refreshed. Should be called on Win8+ after MigrateStartMenuShortcut

; and UpdateShortcutBranding.

!macro TouchStartMenuShortcut

  ${If} ${FileExists} "$SMPROGRAMS\${BrandFullName}.lnk"

    FileOpen $0 "$SMPROGRAMS\${BrandFullName}.lnk" a

  ${If} ${FileExists} "$SMPROGRAMS\${BrandShortName}.lnk"

    FileOpen $0 "$SMPROGRAMS\${BrandShortName}.lnk" a

    ${IfNot} ${Errors}

      System::Call '*(i, i) p .r1'

      System::Call 'kernel32::GetSystemTimeAsFileTime(p r1)'
@@ -208,51 +208,51 @@ 
  ${EndIf}



  SetShellVarContext all  ; Set $DESKTOP to All Users

  ${Unless} ${FileExists} "$DESKTOP\${BrandFullName}.lnk"

  ${Unless} ${FileExists} "$DESKTOP\${BrandShortName}.lnk"

    SetShellVarContext current  ; Set $DESKTOP to the current user's desktop

  ${EndUnless}



  ${If} ${FileExists} "$DESKTOP\${BrandFullName}.lnk"

    ShellLink::GetShortCutArgs "$DESKTOP\${BrandFullName}.lnk"

  ${If} ${FileExists} "$DESKTOP\${BrandShortName}.lnk"

    ShellLink::GetShortCutArgs "$DESKTOP\${BrandShortName}.lnk"

    Pop $0

    ${If} "$0" == ""

      ShellLink::GetShortCutTarget "$DESKTOP\${BrandFullName}.lnk"

      ShellLink::GetShortCutTarget "$DESKTOP\${BrandShortName}.lnk"

      Pop $0

      ${GetLongPath} "$0" $0

      ${If} "$0" == "$INSTDIR\${FileMainEXE}"

        Delete "$DESKTOP\${BrandFullName}.lnk"

        Delete "$DESKTOP\${BrandShortName}.lnk"

      ${EndIf}

    ${EndIf}

  ${EndIf}



  SetShellVarContext all  ; Set $SMPROGRAMS to All Users

  ${Unless} ${FileExists} "$SMPROGRAMS\${BrandFullName}.lnk"

  ${Unless} ${FileExists} "$SMPROGRAMS\${BrandShortName}.lnk"

    SetShellVarContext current  ; Set $SMPROGRAMS to the current user's Start

                                ; Menu Programs directory

  ${EndUnless}



  ${If} ${FileExists} "$SMPROGRAMS\${BrandFullName}.lnk"

    ShellLink::GetShortCutArgs "$SMPROGRAMS\${BrandFullName}.lnk"

  ${If} ${FileExists} "$SMPROGRAMS\${BrandShortName}.lnk"

    ShellLink::GetShortCutArgs "$SMPROGRAMS\${BrandShortName}.lnk"

    Pop $0

    ${If} "$0" == ""

      ShellLink::GetShortCutTarget "$SMPROGRAMS\${BrandFullName}.lnk"

      ShellLink::GetShortCutTarget "$SMPROGRAMS\${BrandShortName}.lnk"

      Pop $0

      ${GetLongPath} "$0" $0

      ${If} "$0" == "$INSTDIR\${FileMainEXE}"

        Delete "$SMPROGRAMS\${BrandFullName}.lnk"

        Delete "$SMPROGRAMS\${BrandShortName}.lnk"

      ${EndIf}

    ${EndIf}

  ${EndIf}



  ${If} ${FileExists} "$QUICKLAUNCH\${BrandFullName}.lnk"

    ShellLink::GetShortCutArgs "$QUICKLAUNCH\${BrandFullName}.lnk"

  ${If} ${FileExists} "$QUICKLAUNCH\${BrandShortName}.lnk"

    ShellLink::GetShortCutArgs "$QUICKLAUNCH\${BrandShortName}.lnk"

    Pop $0

    ${If} "$0" == ""

      ShellLink::GetShortCutTarget "$QUICKLAUNCH\${BrandFullName}.lnk"

      ShellLink::GetShortCutTarget "$QUICKLAUNCH\${BrandShortName}.lnk"

      Pop $0

      ${GetLongPath} "$0" $0

      ${If} "$0" == "$INSTDIR\${FileMainEXE}"

        Delete "$QUICKLAUNCH\${BrandFullName}.lnk"

        Delete "$QUICKLAUNCH\${BrandShortName}.lnk"

      ${EndIf}

    ${EndIf}

  ${EndIf}
@@ -275,24 +275,24 @@ 
  ${EndIf}



  SetShellVarContext all  ; Set $DESKTOP to All Users

  ${Unless} ${FileExists} "$DESKTOP\${BrandFullName}.lnk"

    CreateShortCut "$DESKTOP\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}"

    ${If} ${FileExists} "$DESKTOP\${BrandFullName}.lnk"

      ShellLink::SetShortCutWorkingDirectory "$DESKTOP\${BrandFullName}.lnk" "$INSTDIR"

  ${Unless} ${FileExists} "$DESKTOP\${BrandShortName}.lnk"

    CreateShortCut "$DESKTOP\${BrandShortName}.lnk" "$INSTDIR\${FileMainEXE}"

    ${If} ${FileExists} "$DESKTOP\${BrandShortName}.lnk"

      ShellLink::SetShortCutWorkingDirectory "$DESKTOP\${BrandShortName}.lnk" "$INSTDIR"

      ${If} ${AtLeastWin7}

      ${AndIf} "$AppUserModelID" != ""

        ApplicationID::Set "$DESKTOP\${BrandFullName}.lnk" "$AppUserModelID" "true"

        ApplicationID::Set "$DESKTOP\${BrandShortName}.lnk" "$AppUserModelID" "true"

      ${EndIf}

    ${Else}

      SetShellVarContext current  ; Set $DESKTOP to the current user's desktop

      ${Unless} ${FileExists} "$DESKTOP\${BrandFullName}.lnk"

        CreateShortCut "$DESKTOP\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}"

        ${If} ${FileExists} "$DESKTOP\${BrandFullName}.lnk"

          ShellLink::SetShortCutWorkingDirectory "$DESKTOP\${BrandFullName}.lnk" \

      ${Unless} ${FileExists} "$DESKTOP\${BrandShortName}.lnk"

        CreateShortCut "$DESKTOP\${BrandShortName}.lnk" "$INSTDIR\${FileMainEXE}"

        ${If} ${FileExists} "$DESKTOP\${BrandShortName}.lnk"

          ShellLink::SetShortCutWorkingDirectory "$DESKTOP\${BrandShortName}.lnk" \

                                                 "$INSTDIR"

          ${If} ${AtLeastWin7}

          ${AndIf} "$AppUserModelID" != ""

            ApplicationID::Set "$DESKTOP\${BrandFullName}.lnk" "$AppUserModelID" "true"

            ApplicationID::Set "$DESKTOP\${BrandShortName}.lnk" "$AppUserModelID" "true"

          ${EndIf}

        ${EndIf}

      ${EndUnless}
@@ -300,26 +300,26 @@ 
  ${EndUnless}



  SetShellVarContext all  ; Set $SMPROGRAMS to All Users

  ${Unless} ${FileExists} "$SMPROGRAMS\${BrandFullName}.lnk"

    CreateShortCut "$SMPROGRAMS\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}"

    ${If} ${FileExists} "$SMPROGRAMS\${BrandFullName}.lnk"

      ShellLink::SetShortCutWorkingDirectory "$SMPROGRAMS\${BrandFullName}.lnk" \

  ${Unless} ${FileExists} "$SMPROGRAMS\${BrandShortName}.lnk"

    CreateShortCut "$SMPROGRAMS\${BrandShortName}.lnk" "$INSTDIR\${FileMainEXE}"

    ${If} ${FileExists} "$SMPROGRAMS\${BrandShortName}.lnk"

      ShellLink::SetShortCutWorkingDirectory "$SMPROGRAMS\${BrandShortName}.lnk" \

                                             "$INSTDIR"

      ${If} ${AtLeastWin7}

      ${AndIf} "$AppUserModelID" != ""

        ApplicationID::Set "$SMPROGRAMS\${BrandFullName}.lnk" "$AppUserModelID" "true"

        ApplicationID::Set "$SMPROGRAMS\${BrandShortName}.lnk" "$AppUserModelID" "true"

      ${EndIf}

    ${Else}

      SetShellVarContext current  ; Set $SMPROGRAMS to the current user's Start

                                  ; Menu Programs directory

      ${Unless} ${FileExists} "$SMPROGRAMS\${BrandFullName}.lnk"

        CreateShortCut "$SMPROGRAMS\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}"

        ${If} ${FileExists} "$SMPROGRAMS\${BrandFullName}.lnk"

          ShellLink::SetShortCutWorkingDirectory "$SMPROGRAMS\${BrandFullName}.lnk" \

      ${Unless} ${FileExists} "$SMPROGRAMS\${BrandShortName}.lnk"

        CreateShortCut "$SMPROGRAMS\${BrandShortName}.lnk" "$INSTDIR\${FileMainEXE}"

        ${If} ${FileExists} "$SMPROGRAMS\${BrandShortName}.lnk"

          ShellLink::SetShortCutWorkingDirectory "$SMPROGRAMS\${BrandShortName}.lnk" \

                                                 "$INSTDIR"

          ${If} ${AtLeastWin7}

          ${AndIf} "$AppUserModelID" != ""

            ApplicationID::Set "$SMPROGRAMS\${BrandFullName}.lnk" "$AppUserModelID" "true"

            ApplicationID::Set "$SMPROGRAMS\${BrandShortName}.lnk" "$AppUserModelID" "true"

          ${EndIf}

        ${EndIf}

      ${EndUnless}
@@ -328,11 +328,11 @@ 


  ; Windows 7 doesn't use the QuickLaunch directory

  ${Unless} ${AtLeastWin7}

  ${AndUnless} ${FileExists} "$QUICKLAUNCH\${BrandFullName}.lnk"

    CreateShortCut "$QUICKLAUNCH\${BrandFullName}.lnk" \

  ${AndUnless} ${FileExists} "$QUICKLAUNCH\${BrandShortName}.lnk"

    CreateShortCut "$QUICKLAUNCH\${BrandShortName}.lnk" \

                   "$INSTDIR\${FileMainEXE}"

    ${If} ${FileExists} "$QUICKLAUNCH\${BrandFullName}.lnk"

      ShellLink::SetShortCutWorkingDirectory "$QUICKLAUNCH\${BrandFullName}.lnk" \

    ${If} ${FileExists} "$QUICKLAUNCH\${BrandShortName}.lnk"

      ShellLink::SetShortCutWorkingDirectory "$QUICKLAUNCH\${BrandShortName}.lnk" \

                                             "$INSTDIR"

    ${EndIf}

  ${EndUnless}
@@ -340,9 +340,11 @@ 
!define ShowShortcuts "!insertmacro ShowShortcuts"



; Update the branding information on all shortcuts our installer created,

; in case the branding has changed between updates.

; to convert from BrandFullName (which is what we used to name shortcuts)

; to BrandShortName (which is what we now name shortcuts). Also update the

; icon if it's been changed.

; This should only be called sometime after both MigrateStartMenuShortcut

; and MigrateTaskBarShurtcut

; and MigrateTaskBarShurtcut, and it assumes SHCTX is set correctly.

!macro UpdateShortcutBranding

  ${GetLongPath} "$INSTDIR\uninstall\${SHORTCUTS_LOG}" $R9

  ${If} ${FileExists} "$R9"
@@ -370,16 +372,16 @@ 
          ${EndIf}



          ${If} $R5 == "1"

          ${OrIf} $R8 != "${BrandFullName}.lnk"

          ${OrIf} $R8 != "${BrandShortName}.lnk"

            Delete "$SMPROGRAMS\$R8"

            ${If} ${FileExists} "$INSTDIR\firefox.ico"

              CreateShortcut "$SMPROGRAMS\${BrandFullName}.lnk" \

              CreateShortcut "$SMPROGRAMS\${BrandShortName}.lnk" \

                             "$INSTDIR\${FileMainEXE}" "" "$INSTDIR\firefox.ico"

            ${Else}

              CreateShortcut "$SMPROGRAMS\${BrandFullName}.lnk" \

              CreateShortcut "$SMPROGRAMS\${BrandShortName}.lnk" \

                             "$INSTDIR\${FileMainEXE}"

            ${EndIf}

            WriteINIStr "$R9" "STARTMENU" "Shortcut0" "${BrandFullName}.lnk"

            WriteINIStr "$R9" "STARTMENU" "Shortcut0" "${BrandShortName}.lnk"

          ${EndIf}

        ${EndIf}

      ${EndIf}
@@ -407,16 +409,16 @@ 
          ${EndIf}



          ${If} $R5 == "1"

          ${OrIf} $R8 != "${BrandFullName}.lnk"

          ${OrIf} $R8 != "${BrandShortName}.lnk"

            Delete "$DESKTOP\$R8"

            ${If} ${FileExists} "$INSTDIR\firefox.ico"

              CreateShortcut "$DESKTOP\${BrandFullName}.lnk" \

              CreateShortcut "$DESKTOP\${BrandShortName}.lnk" \

                             "$INSTDIR\${FileMainEXE}" "" "$INSTDIR\firefox.ico"

            ${Else}

              CreateShortcut "$DESKTOP\${BrandFullName}.lnk" \

              CreateShortcut "$DESKTOP\${BrandShortName}.lnk" \

                             "$INSTDIR\${FileMainEXE}"

            ${EndIf}

            WriteINIStr "$R9" "DESKTOP" "Shortcut0" "${BrandFullName}.lnk"

            WriteINIStr "$R9" "DESKTOP" "Shortcut0" "${BrandShortName}.lnk"

          ${EndIf}

        ${EndIf}

      ${EndIf}
@@ -1291,7 +1293,7 @@ 
      ReadINIStr $1 "$0" "STARTMENU" "Shortcut0"

      ${If} ${Errors}

        ; The STARTMENU ini section doesn't exist.

        ${LogStartMenuShortcut} "${BrandFullName}.lnk"

        ${LogStartMenuShortcut} "${BrandShortName}.lnk"

        ${GetLongPath} "$SMPROGRAMS" $2

        ${GetLongPath} "$2\$5" $1

        ${If} "$1" != ""
@@ -1302,14 +1304,14 @@ 
              ShellLink::GetShortCutTarget "$1\$3"

              Pop $4

              ${If} "$INSTDIR\${FileMainEXE}" == "$4"

                CreateShortCut "$SMPROGRAMS\${BrandFullName}.lnk" \

                CreateShortCut "$SMPROGRAMS\${BrandShortName}.lnk" \

                               "$INSTDIR\${FileMainEXE}"

                ${If} ${FileExists} "$SMPROGRAMS\${BrandFullName}.lnk"

                  ShellLink::SetShortCutWorkingDirectory "$SMPROGRAMS\${BrandFullName}.lnk" \

                ${If} ${FileExists} "$SMPROGRAMS\${BrandShortName}.lnk"

                  ShellLink::SetShortCutWorkingDirectory "$SMPROGRAMS\${BrandShortName}.lnk" \

                                                         "$INSTDIR"

                  ${If} ${AtLeastWin7}

                  ${AndIf} "$AppUserModelID" != ""

                    ApplicationID::Set "$SMPROGRAMS\${BrandFullName}.lnk" \

                    ApplicationID::Set "$SMPROGRAMS\${BrandShortName}.lnk" \

                                       "$AppUserModelID" "true"

                  ${EndIf}

                ${EndIf}
@@ -1387,9 +1389,9 @@ 
!macro CreateShortcutsLog

  ${GetShortcutsLogPath} $0

  ${Unless} ${FileExists} "$0"

    ${LogStartMenuShortcut} "${BrandFullName}.lnk"

    ${LogQuickLaunchShortcut} "${BrandFullName}.lnk"

    ${LogDesktopShortcut} "${BrandFullName}.lnk"

    ${LogStartMenuShortcut} "${BrandShortName}.lnk"

    ${LogQuickLaunchShortcut} "${BrandShortName}.lnk"

    ${LogDesktopShortcut} "${BrandShortName}.lnk"

  ${EndUnless}

!macroend

!define CreateShortcutsLog "!insertmacro CreateShortcutsLog"

toolkit/mozapps/installer/windows/nsis/common.nsh

+30 −0
Original line number Diff line number Diff line
@@ -3629,6 +3629,16 @@ 
            ${EndIf}

          ${EndIf}

        ${Loop}

        ; There might also be a shortcut with a different name created by a

        ; previous version of the installer.

        ${If} ${FileExists} "$SMPROGRAMS\${BrandFullName}.lnk"

          ShellLink::GetShortCutTarget "$SMPROGRAMS\${BrandFullName}.lnk"

          Pop $R5

          ${${_MOZFUNC_UN}GetLongPath} "$R5" $R5

          ${If} "$INSTDIR\${FileMainEXE}" == "$R5"

            Delete "$SMPROGRAMS\${BrandFullName}.lnk"

          ${EndIf}

        ${EndIf}



        ; Delete Quick Launch shortcuts for this application

        StrCpy $R4 -1
@@ -3649,6 +3659,16 @@ 
            ${EndIf}

          ${EndIf}

        ${Loop}

        ; There might also be a shortcut with a different name created by a

        ; previous version of the installer.

        ${If} ${FileExists} "$QUICKLAUNCH\${BrandFullName}.lnk"

          ShellLink::GetShortCutTarget "$QUICKLAUNCH\${BrandFullName}.lnk"

          Pop $R5

          ${${_MOZFUNC_UN}GetLongPath} "$R5" $R5

          ${If} "$INSTDIR\${FileMainEXE}" == "$R5"

            Delete "$QUICKLAUNCH\${BrandFullName}.lnk"

          ${EndIf}

        ${EndIf}



        ; Delete Desktop shortcuts for this application

        StrCpy $R4 -1
@@ -3669,6 +3689,16 @@ 
            ${EndIf}

          ${EndIf}

        ${Loop}

        ; There might also be a shortcut with a different name created by a

        ; previous version of the installer.

        ${If} ${FileExists} "$DESKTOP\${BrandFullName}.lnk"

          ShellLink::GetShortCutTarget "$DESKTOP\${BrandFullName}.lnk"

          Pop $R5

          ${${_MOZFUNC_UN}GetLongPath} "$R5" $R5

          ${If} "$INSTDIR\${FileMainEXE}" == "$R5"

            Delete "$DESKTOP\${BrandFullName}.lnk"

          ${EndIf}

        ${EndIf}



        ${${_MOZFUNC_UN}GetLongPath} "$SMPROGRAMS" $R6