feat: prepare firefox

Atlas-OS · Nov 14, 2023 · f0e80cd · f0e80cd
1 parent d58b963
commit f0e80cd
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 28 deletions.
diff --git a/src/playbook/Configuration/atlas/start.yml b/src/playbook/Configuration/atlas/start.yml
@@ -66,12 +66,12 @@ actions:
     weight: 150
     option: 'browser-brave'
     runas: currentUserElevated
-  - !writeStatus: {status: 'Installing Waterfox', option: 'browser-waterfox'}
+  - !writeStatus: {status: 'Installing Firefox', option: 'browser-firefox'}
   - !powerShell:
-    command: '& """SOFTWARE.ps1""" -Waterfox'
+    command: '& """SOFTWARE.ps1""" -Firefox'
     exeDir: true
     weight: 150
-    option: 'browser-waterfox'
+    option: 'browser-firefox'
     runas: currentUserElevated
 
   ################ END NO LOCAL BUILD ################
diff --git a/src/playbook/Configuration/tweaks/qol/taskbar/config-pins.yml b/src/playbook/Configuration/tweaks/qol/taskbar/config-pins.yml
@@ -17,8 +17,8 @@ actions:
     exeDir: true
   - !run:
     exe: 'TASKBARPINS.cmd'
-    args: '"Waterfox"'
-    option: 'browser-waterfox'
+    args: '"Firefox"'
+    option: 'browser-firefox'
     exeDir: true
   - !run:
     exe: 'TASKBARPINS.cmd'

diff --git a/src/playbook/Configuration/tweaks/scripts/script-file-associations.yml b/src/playbook/Configuration/tweaks/scripts/script-file-associations.yml
@@ -14,8 +14,8 @@ actions:
     exeDir: true
   - !run:
     exe: 'FILEASSOC.cmd'
-    args: '"WaterFox"'
-    option: 'browser-waterfox'
+    args: '"Firefox"'
+    option: 'browser-firefox'
     exeDir: true
   - !run:
     exe: 'FILEASSOC.cmd'

diff --git a/src/playbook/Executables/FILEASSOC.cmd b/src/playbook/Executables/FILEASSOC.cmd
@@ -20,12 +20,12 @@ set braveAssociations="Proto:https:BraveHTML"^
  ".pdf:BraveFile"^
  ".shtml:BraveHTML"
 
-set waterfoxAssociations="Proto:https:WaterfoxURL-6F940AC27A98DD61"^
- "Proto:http:WaterfoxURL-6F940AC27A98DD61"^
- ".htm:WaterfoxHTML-6F940AC27A98DD61"^
- ".html:WaterfoxHTML-6F940AC27A98DD61"^
- ".pdf:WaterfoxHTML-6F940AC27A98DD61"^
- ".shtml:WaterfoxHTML-6F940AC27A98DD61"
+set firefoxAssociations="Proto:https:FirefoxURL-308046B0AF4A39CB"^
+ "Proto:http:FirefoxURL-308046B0AF4A39CB"^
+ ".htm:FirefoxHTML-308046B0AF4A39CB"^
+ ".html:FirefoxHTML-308046B0AF4A39CB"^
+ ".pdf:FirefoxPDF-308046B0AF4A39CB"^
+ ".shtml:FirefoxHTML-308046B0AF4A39CB"
 
 set chromeAssociations="Proto:https:ChromeHTML"^
  "Proto:http:ChromeHTML"^
@@ -37,7 +37,7 @@ set chromeAssociations="Proto:https:ChromeHTML"^
 if "%~1" == "" set "associations=%baseAssociations%"
 if "%~1" == "Microsoft Edge" set "associations=%baseAssociations%"
 if "%~1" == "Brave" set "associations=%baseAssociations% %braveAssociations%"
-if "%~1" == "WaterFox" set "associations=%baseAssociations% %waterfoxAssociations%"
+if "%~1" == "Firefox" set "associations=%baseAssociations% %firefoxAssociations%"
 if "%~1" == "Google Chrome" set "associations=%baseAssociations% %chromeAssociations%"
 
 :: Set 7-Zip assocations

diff --git a/src/playbook/Executables/SOFTWARE.ps1 b/src/playbook/Executables/SOFTWARE.ps1
@@ -1,7 +1,7 @@
 param (
 	[switch]$Chrome,
 	[switch]$Brave,
-	[switch]$Waterfox
+	[switch]$Firefox
 )
 
 # ----------------------------------------------------------------------------------------------------------- #
@@ -38,11 +38,11 @@ if ($Brave) {
 	exit
 }
 
-# Waterfox
-if ($Waterfox) {
-	Write-Host "Installing Waterfox..."
-	& curl.exe -LSs "https://cdn1.waterfox.net/waterfox/releases/latest/windows" -o "$tempDir\waterfox.exe"
-	Start-Process -FilePath "$tempDir\waterfox.exe" -WindowStyle Hidden -ArgumentList '/S /ALLUSERS=1' -Wait 2>&1 | Out-Null
+# Firefox
+if ($Firefox) {
+	Write-Host "Installing Firefox..."
+	& curl.exe -LSs "https://download.mozilla.org/?product=firefox-latest-ssl&os=win64&lang=en-US" -o "$tempDir\firefox.exe"
+	Start-Process -FilePath "$tempDir\firefox.exe" -WindowStyle Hidden -ArgumentList '/S /ALLUSERS=1' -Wait 2>&1 | Out-Null
 	exit
 }
 

diff --git a/src/playbook/Executables/Shortcuts/Firefox.lnk b/src/playbook/Executables/Shortcuts/Firefox.lnk
diff --git a/src/playbook/Executables/Shortcuts/Waterfox.lnk b/src/playbook/Executables/Shortcuts/Waterfox.lnk
diff --git a/src/playbook/playbook.conf b/src/playbook/playbook.conf
@@ -88,23 +88,23 @@
 			<BottomLine Text="Learn more" Link="https://docs.atlasos.net/getting-started/post-installation/atlas-folder/configuration"/>
 		</CheckboxPage>
 		<RadioImagePage CheckDefaultBrowser="true" DependsOn="uninstall-edge" DefaultOption="browser-brave" Description="Select your preferred browser to install, as Microsoft Edge will be uninstalled.">
-			<TopLine Text="Chrome isn't good for privacy, it's not recommended."/>
+			<TopLine Text="Recommended browsers for privacy and easy of use."/>
 			<Options>
 				<RadioImageOption None="true"/>
+				<RadioImageOption>
+					<Text>Firefox</Text>
+					<Name>browser-firefox</Name>
+					<FileName>firefox</FileName>
+					<GradientTopColor>#4676ed</GradientTopColor>
+					<GradientBottomColor>#acf5fe</GradientBottomColor>
+				</RadioImageOption>
 				<RadioImageOption>
 					<Text>Brave</Text>
 					<Name>browser-brave</Name>
 					<FileName>brave</FileName>
 					<GradientTopColor>#131524</GradientTopColor>
 					<GradientBottomColor>#3b3e4f</GradientBottomColor>
 				</RadioImageOption>
-				<RadioImageOption>
-					<Text>Waterfox</Text>
-					<Name>browser-waterfox</Name>
-					<FileName>waterfox</FileName>
-					<GradientTopColor>#4676ed</GradientTopColor>
-					<GradientBottomColor>#acf5fe</GradientBottomColor>
-				</RadioImageOption>
 				<RadioImageOption>
 					<Text>Chrome</Text>
 					<Name>browser-chrome</Name>