diff options
Diffstat (limited to 'browser/installer')
| -rwxr-xr-x | browser/installer/windows/nsis/installer.nsi | 24 | ||||
| -rw-r--r-- | browser/installer/windows/nsis/maintenanceservice_installer.nsi | 2 | ||||
| -rw-r--r-- | browser/installer/windows/nsis/stub.nsi | 38 | ||||
| -rwxr-xr-x | browser/installer/windows/nsis/uninstaller.nsi | 44 |
4 files changed, 54 insertions, 54 deletions
diff --git a/browser/installer/windows/nsis/installer.nsi b/browser/installer/windows/nsis/installer.nsi index 1f20c01eb..aed5808cd 100755 --- a/browser/installer/windows/nsis/installer.nsi +++ b/browser/installer/windows/nsis/installer.nsi @@ -253,7 +253,7 @@ Section "-InstallStartCleanup" ${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs" ; Remove the updates directory for Vista and above - ${CleanUpdateDirectories} "Mozilla\Firefox" "Mozilla\updates" + ${CleanUpdateDirectories} "Mozilla\Basilisk" "Mozilla\updates" ${RemoveDeprecatedFiles} ${RemovePrecompleteEntries} "false" @@ -374,17 +374,17 @@ Section "-Application" APP_IDX ; it doesn't cause problems always add them. ${SetUninstallKeys} - ; On install always add the FirefoxHTML and FirefoxURL keys. - ; An empty string is used for the 5th param because FirefoxHTML is not a + ; On install always add the BasiliskHTML and BasiliskURL keys. + ; An empty string is used for the 5th param because BasiliskHTML is not a ; protocol handler. ${GetLongPath} "$INSTDIR\${FileMainEXE}" $8 StrCpy $2 "$\"$8$\" -osint -url $\"%1$\"" - ; In Win8, the delegate execute handler picks up the value in FirefoxURL and - ; FirefoxHTML to launch the desktop browser when it needs to. - ${AddDisabledDDEHandlerValues} "FirefoxHTML" "$2" "$8,1" \ + ; In Win8, the delegate execute handler picks up the value in BasiliskURL and + ; BasiliskHTML to launch the desktop browser when it needs to. + ${AddDisabledDDEHandlerValues} "BasiliskHTML" "$2" "$8,1" \ "${AppRegName} Document" "" - ${AddDisabledDDEHandlerValues} "FirefoxURL" "$2" "$8,1" "${AppRegName} URL" \ + ${AddDisabledDDEHandlerValues} "BasiliskURL" "$2" "$8,1" "${AppRegName} URL" \ "true" ; For pre win8, the following keys should only be set if we can write to HKLM. @@ -620,7 +620,7 @@ Section "-InstallEndCleanup" ; If we have something other than empty string now, write the value. ${If} "$0" != "" ClearErrors - WriteRegStr HKCU "Software\Mozilla\Firefox" "OldDefaultBrowserCommand" "$0" + WriteRegStr HKCU "Software\Mozilla\Basilisk" "OldDefaultBrowserCommand" "$0" ${EndIf} ${LogHeader} "Setting as the default browser" @@ -636,7 +636,7 @@ Section "-InstallEndCleanup" ${ElseIfNot} ${Errors} ${LogHeader} "Writing default-browser opt-out" ClearErrors - WriteRegStr HKCU "Software\Mozilla\Firefox" "DefaultBrowserOptOut" "True" + WriteRegStr HKCU "Software\Mozilla\Basilisk" "DefaultBrowserOptOut" "True" ${If} ${Errors} ${LogMsg} "Error writing default-browser opt-out" ${EndIf} @@ -1049,14 +1049,14 @@ Function preSummary WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test" ${Unless} ${Errors} DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" - ; Check if Firefox is the http handler for this user. + ; Check if Basilisk is the http handler for this user. SetShellVarContext current ; Set SHCTX to the current user ${IsHandlerForInstallDir} "http" $R9 ${If} $TmpVal == "HKLM" SetShellVarContext all ; Set SHCTX to all users ${EndIf} - ; If Firefox isn't the http handler for this user show the option to set - ; Firefox as the default browser. + ; If Basilisk isn't the http handler for this user show the option to set + ; Basilisk as the default browser. ${If} "$R9" != "true" ${AndIf} ${AtMostWin2008R2} WriteINIStr "$PLUGINSDIR\summary.ini" "Settings" NumFields "4" diff --git a/browser/installer/windows/nsis/maintenanceservice_installer.nsi b/browser/installer/windows/nsis/maintenanceservice_installer.nsi index ef30c1360..4bc9d2bed 100644 --- a/browser/installer/windows/nsis/maintenanceservice_installer.nsi +++ b/browser/installer/windows/nsis/maintenanceservice_installer.nsi @@ -78,7 +78,7 @@ SetOverwrite on "Software\Microsoft\Windows\CurrentVersion\Uninstall\MozillaMaintenanceService" ; Always install into the 32-bit location even if we have a 64-bit build. -; This is because we use only 1 service for all Firefox channels. +; This is because we use only 1 service for all Basilisk channels. ; Allow either x86 and x64 builds to exist at this location, depending on ; what is the latest build. InstallDir "$PROGRAMFILES32\${MaintFullName}\" diff --git a/browser/installer/windows/nsis/stub.nsi b/browser/installer/windows/nsis/stub.nsi index 176f641b3..5c19c10fe 100644 --- a/browser/installer/windows/nsis/stub.nsi +++ b/browser/installer/windows/nsis/stub.nsi @@ -76,7 +76,7 @@ Var ProgressTotal Var TmpVal Var ExitCode -Var FirefoxLaunchCode +Var BasiliskLaunchCode ; The first three tick counts are for the start of a phase and equate equate to ; the display of individual installer pages. @@ -457,7 +457,7 @@ Function .onInit StrCpy $EndInstallPhaseTickCount "0" StrCpy $InitialInstallRequirementsCode "" StrCpy $IsDownloadFinished "" - StrCpy $FirefoxLaunchCode "0" + StrCpy $BasiliskLaunchCode "0" StrCpy $CheckboxShortcutOnBar "1" StrCpy $CheckboxShortcutInStartMenu "1" StrCpy $CheckboxShortcutOnDesktop "1" @@ -674,17 +674,17 @@ Function SendPing ${GetParent} "$R2" $R3 ${GetLongPath} "$R3" $R3 ${If} $R3 == $INSTDIR - StrCpy $R2 "1" ; This Firefox install is set as default. + StrCpy $R2 "1" ; This Basilisk install is set as default. ${Else} StrCpy $R2 "$R2" "" -11 # length of firefox.exe ${If} "$R2" == "${FileMainEXE}" - StrCpy $R2 "2" ; Another Firefox install is set as default. + StrCpy $R2 "2" ; Another Basilisk install is set as default. ${Else} StrCpy $R2 "0" ${EndIf} ${EndIf} ${Else} - StrCpy $R2 "0" ; Firefox is not set as default. + StrCpy $R2 "0" ; Basilisk is not set as default. ${EndIf} ${If} "$R2" == "0" @@ -704,17 +704,17 @@ Function SendPing ${GetParent} "$R2" $R3 ${GetLongPath} "$R3" $R3 ${If} $R3 == $INSTDIR - StrCpy $R2 "1" ; This Firefox install is set as default. + StrCpy $R2 "1" ; This Basilisk install is set as default. ${Else} StrCpy $R2 "$R2" "" -11 # length of firefox.exe ${If} "$R2" == "${FileMainEXE}" - StrCpy $R2 "2" ; Another Firefox install is set as default. + StrCpy $R2 "2" ; Another Basilisk install is set as default. ${Else} StrCpy $R2 "0" ${EndIf} ${EndIf} ${Else} - StrCpy $R2 "0" ; Firefox is not set as default. + StrCpy $R2 "0" ; Basilisk is not set as default. ${EndIf} ${EndIf} ${EndUnless} @@ -740,7 +740,7 @@ Function SendPing $\nBuild Channel = ${Channel} \ $\nUpdate Channel = ${UpdateChannel} \ $\nLocale = ${AB_CD} \ - $\nFirefox x64 = $R0 \ + $\nBasilisk x64 = $R0 \ $\nRunning x64 Windows = $R1 \ $\nMajor = $5 \ $\nMinor = $6 \ @@ -748,7 +748,7 @@ Function SendPing $\nServicePack = $8 \ $\nIsServer = $9 \ $\nExit Code = $ExitCode \ - $\nFirefox Launch Code = $FirefoxLaunchCode \ + $\nBasilisk Launch Code = $BasiliskLaunchCode \ $\nDownload Retry Count = $DownloadRetryCount \ $\nDownloaded Bytes = $DownloadedBytes \ $\nDownload Size Bytes = $DownloadSizeBytes \ @@ -779,7 +779,7 @@ Function SendPing Call RelativeGotoPage !else ${NSD_CreateTimer} OnPing ${DownloadIntervalMS} - InetBgDL::Get "${BaseURLStubPing}/${StubURLVersion}${StubURLVersionAppend}/${Channel}/${UpdateChannel}/${AB_CD}/$R0/$R1/$5/$6/$7/$8/$9/$ExitCode/$FirefoxLaunchCode/$DownloadRetryCount/$DownloadedBytes/$DownloadSizeBytes/$IntroPhaseSeconds/$OptionsPhaseSeconds/$0/$1/$DownloadFirstTransferSeconds/$2/$3/$4/$InitialInstallRequirementsCode/$OpenedDownloadPage/$ExistingProfile/$ExistingVersion/$ExistingBuildID/$R5/$R6/$R7/$R8/$R2/$R3/$DownloadServerIP/$PostSigningData" \ + InetBgDL::Get "${BaseURLStubPing}/${StubURLVersion}${StubURLVersionAppend}/${Channel}/${UpdateChannel}/${AB_CD}/$R0/$R1/$5/$6/$7/$8/$9/$ExitCode/$BasiliskLaunchCode/$DownloadRetryCount/$DownloadedBytes/$DownloadSizeBytes/$IntroPhaseSeconds/$OptionsPhaseSeconds/$0/$1/$DownloadFirstTransferSeconds/$2/$3/$4/$InitialInstallRequirementsCode/$OpenedDownloadPage/$ExistingProfile/$ExistingVersion/$ExistingBuildID/$R5/$R6/$R7/$R8/$R2/$R3/$DownloadServerIP/$PostSigningData" \ "$PLUGINSDIR\_temp" /END !endif ${Else} @@ -805,10 +805,10 @@ Function createIntro nsDialogs::OnBack /NOUNLOAD $0 !ifdef ${AB_CD}_rtl - ; For RTL align the text with the top of the F in the Firefox bitmap + ; For RTL align the text with the top of the F in the Basilisk bitmap StrCpy $0 "${INTRO_BLURB_RTL_TOP_DU}" !else - ; For LTR align the text with the top of the x in the Firefox bitmap + ; For LTR align the text with the top of the x in the Basilisk bitmap StrCpy $0 "${INTRO_BLURB_LTR_TOP_DU}" !endif ${NSD_CreateLabel} ${INTRO_BLURB_EDGE_DU} $0 ${INTRO_BLURB_WIDTH_DU} 76u "${INTRO_BLURB}" @@ -1337,7 +1337,7 @@ Function createInstall StrCpy $ExistingBuildID "0" ${EndIf} - ${If} ${FileExists} "$LOCALAPPDATA\Mozilla\Firefox" + ${If} ${FileExists} "$LOCALAPPDATA\Mozilla\Basilisk" StrCpy $ExistingProfile "1" ${Else} StrCpy $ExistingProfile "0" @@ -1771,7 +1771,7 @@ Function FinishInstall ; If we have something other than empty string now, write the value. ${If} "$0" != "" ClearErrors - WriteRegStr HKCU "Software\Mozilla\Firefox" "OldDefaultBrowserCommand" "$0" + WriteRegStr HKCU "Software\Mozilla\Basilisk" "OldDefaultBrowserCommand" "$0" ${EndIf} ${GetParameters} $0 @@ -2017,13 +2017,13 @@ Function LaunchApp !ifndef DEV_EDITION FindWindow $0 "${WindowClass}" ${If} $0 <> 0 ; integer comparison - StrCpy $FirefoxLaunchCode "1" + StrCpy $BasiliskLaunchCode "1" MessageBox MB_OK|MB_ICONQUESTION "$(WARN_MANUALLY_CLOSE_APP_LAUNCH)" Return ${EndIf} !endif - StrCpy $FirefoxLaunchCode "2" + StrCpy $BasiliskLaunchCode "2" ; Set the current working directory to the installation directory SetOutPath "$INSTDIR" @@ -2056,8 +2056,8 @@ Function CopyPostSigningData ClearErrors StrCpy $PostSigningData "0" ${Else} - CreateDirectory "$LOCALAPPDATA\Mozilla\Firefox" - CopyFiles /SILENT "$EXEDIR\postSigningData" "$LOCALAPPDATA\Mozilla\Firefox" + CreateDirectory "$LOCALAPPDATA\Mozilla\Basilisk" + CopyFiles /SILENT "$EXEDIR\postSigningData" "$LOCALAPPDATA\Mozilla\Basilisk" ${Endif} FunctionEnd diff --git a/browser/installer/windows/nsis/uninstaller.nsi b/browser/installer/windows/nsis/uninstaller.nsi index c97728b47..687bcd6eb 100755 --- a/browser/installer/windows/nsis/uninstaller.nsi +++ b/browser/installer/windows/nsis/uninstaller.nsi @@ -258,7 +258,7 @@ Section "Uninstall" ${EndIf} ; Remove the updates directory for Vista and above - ${un.CleanUpdateDirectories} "Mozilla\Firefox" "Mozilla\updates" + ${un.CleanUpdateDirectories} "Mozilla\Basilisk" "Mozilla\updates" ; Remove any app model id's stored in the registry for this install path DeleteRegValue HKCU "Software\Mozilla\${AppName}\TaskBarIDs" "$INSTDIR" @@ -278,27 +278,27 @@ Section "Uninstall" ${un.SetAppLSPCategories} ${EndIf} - ${un.RegCleanAppHandler} "FirefoxURL" - ${un.RegCleanAppHandler} "FirefoxHTML" + ${un.RegCleanAppHandler} "BasiliskURL" + ${un.RegCleanAppHandler} "BasiliskHTML" ${un.RegCleanProtocolHandler} "ftp" ${un.RegCleanProtocolHandler} "http" ${un.RegCleanProtocolHandler} "https" ClearErrors - ReadRegStr $R9 HKCR "FirefoxHTML" "" - ; Don't clean up the file handlers if the FirefoxHTML key still exists since + ReadRegStr $R9 HKCR "BasiliskHTML" "" + ; Don't clean up the file handlers if the BasiliskHTML key still exists since ; there should be a second installation that may be the default file handler ${If} ${Errors} - ${un.RegCleanFileHandler} ".htm" "FirefoxHTML" - ${un.RegCleanFileHandler} ".html" "FirefoxHTML" - ${un.RegCleanFileHandler} ".shtml" "FirefoxHTML" - ${un.RegCleanFileHandler} ".xht" "FirefoxHTML" - ${un.RegCleanFileHandler} ".xhtml" "FirefoxHTML" - ${un.RegCleanFileHandler} ".oga" "FirefoxHTML" - ${un.RegCleanFileHandler} ".ogg" "FirefoxHTML" - ${un.RegCleanFileHandler} ".ogv" "FirefoxHTML" - ${un.RegCleanFileHandler} ".pdf" "FirefoxHTML" - ${un.RegCleanFileHandler} ".webm" "FirefoxHTML" + ${un.RegCleanFileHandler} ".htm" "BasiliskHTML" + ${un.RegCleanFileHandler} ".html" "BasiliskHTML" + ${un.RegCleanFileHandler} ".shtml" "BasiliskHTML" + ${un.RegCleanFileHandler} ".xht" "BasiliskHTML" + ${un.RegCleanFileHandler} ".xhtml" "BasiliskHTML" + ${un.RegCleanFileHandler} ".oga" "BasiliskHTML" + ${un.RegCleanFileHandler} ".ogg" "BasiliskHTML" + ${un.RegCleanFileHandler} ".ogv" "BasiliskHTML" + ${un.RegCleanFileHandler} ".pdf" "BasiliskHTML" + ${un.RegCleanFileHandler} ".webm" "BasiliskHTML" ${EndIf} SetShellVarContext all ; Set SHCTX to HKLM @@ -317,7 +317,7 @@ Section "Uninstall" ; The StartMenuInternet registry key is independent of the default browser ; settings. The XPInstall base un-installer always removes this key if it is ; uninstalling the default browser and it will always replace the keys when - ; installing even if there is another install of Firefox that is set as the + ; installing even if there is another install of Basilisk that is set as the ; default browser. Now the key is always updated on install but it is only ; removed if it refers to this install location. ${If} "$INSTDIR" == "$R1" @@ -333,7 +333,7 @@ Section "Uninstall" ; The StartMenuInternet registry key is independent of the default browser ; settings. The XPInstall base un-installer always removes this key if it is ; uninstalling the default browser and it will always replace the keys when - ; installing even if there is another install of Firefox that is set as the + ; installing even if there is another install of Basilisk that is set as the ; default browser. Now the key is always updated on install but it is only ; removed if it refers to this install location. ${If} "$INSTDIR" == "$R1" @@ -443,12 +443,12 @@ Section "Uninstall" ; clients registry key by the OS under some conditions. System::Call "shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i 0, i 0, i 0)" - ; Users who uninstall then reinstall expecting Firefox to use a clean profile - ; may be surprised during first-run. This key is checked during startup of Firefox and + ; Users who uninstall then reinstall expecting Basilisk to use a clean profile + ; may be surprised during first-run. This key is checked during startup of Basilisk and ; subsequently deleted after checking. If the value is found during startup - ; the browser will offer to Reset Firefox. We use the UpdateChannel to match - ; uninstalls of Firefox-release with reinstalls of Firefox-release, for example. - WriteRegStr HKCU "Software\Mozilla\Firefox" "Uninstalled-${UpdateChannel}" "True" + ; the browser will offer to Reset Basilisk. We use the UpdateChannel to match + ; uninstalls of Basilisk-release with reinstalls of Basilisk-release, for example. + WriteRegStr HKCU "Software\Mozilla\Basilisk" "Uninstalled-${UpdateChannel}" "True" !ifdef MOZ_MAINTENANCE_SERVICE ; Get the path the allowed cert is at and remove it |