From 69f9c93a8c78141ee20ca63659b659b236e3862d Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Fri, 12 May 2023 07:07:59 -0600
Subject: [PATCH] fix

---
 debian.sh | 38 ++++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/debian.sh b/debian.sh
index ca83642..7d3e171 100755
--- a/debian.sh
+++ b/debian.sh
@@ -39,7 +39,7 @@ FLATPAKS+=(org.kde.kapman net.sourceforge.ExtremeTuxRacer com.github.bjaraujo.Bo
 #Packages
 PACKAGES=" iptables-persistent resolvconf wireguard wireguard-tools nmap libsecret-tools libglu1-mesa preload flatpak powertop acpi cockpit cockpit-podman packagekit cockpit-packagekit cockpit-storaged "
 BASE_PACKAGES=" inotify-tools debootstrap cups apt-transport-https samba samba-common nfs-common nfs-kernel-server linux-cpupower locales zram-tools acpid podman ghostscript cifs-utils ntp vim-airline rsync screen base udev git network-manager cryptsetup network-manager-openvpn ntp screen docbook-xsl alsa-utils sysstat fuse3 build-essential unzip bash-completion parted dosfstools wget curl "
-SHARED_DESKTOP_APPS=" nheko firefox-esr kwin-addons kde-standard konsole dolphin kde-spectacle print-manager digikam keepassxc telegram-desktop krita nextcloud-desktop handbrake calligra "
+SHARED_DESKTOP_APPS=" nheko kwin-addons kde-standard konsole dolphin kde-spectacle print-manager digikam keepassxc telegram-desktop krita nextcloud-desktop handbrake calligra "
 #REMOVED=" cockpit-pcp "
 #TROUBLESOME_PACKAGES -  packages here that may not be available for your Debian release
 TROUBLESOME_PACKAGES=" aardvark-dns shfmt podman-compose btop podman-toolbox yt-dlp power-profiles-daemon "
@@ -48,11 +48,18 @@ PACKAGES=$BASE_PACKAGES$PACKAGES$SHARED_DESKTOP_APPS
 #PACKAGES=$BASE_PACKAGES
 TAR_EXCLUDES="--exclude=/.snapshots --exclude=/snapshots --exclude=/var/backups --exclude=/volumes/* --exclude=/mnt/* --exclude=/var/tmp/* --exclude=/tmp/* --exclude=/raid/* --exclude=/root/* --exclude=/var/cache/apt/archives/* --exclude=/proc/* --exclude=/.snapshots/* --exclude=/var/lib/libvirt/* --exclude=/dev/* --exclude=/sys/* --exclude=/home/* --exclude=/var/lib/flatpak --exclude=/var/lib/postgresql --exclude=/var/lib/containers"
 
+installBrowser() {
+	curl -fsSLo /usr/share/keyrings/brave-browser-archive-keyring.gpg https://brave-browser-apt-release.s3.brave.com/brave-browser-archive-keyring.gpg
+	echo "deb [signed-by=/usr/share/keyrings/brave-browser-archive-keyring.gpg] https://brave-browser-apt-release.s3.brave.com/ stable main" | tee /etc/apt/sources.list.d/brave-browser-release.list
+	apt update
+	apt install brave-browser -y
+}
+
 partitionDetection() {
 	#This is used for the installer to do script-based actions
-	EFI=`blkid | grep $HARD_DISK | sort | cut -d ":" -f1 | head -1 | tail -1`
-	BOOT=`blkid | grep $HARD_DISK | sort | cut -d ":" -f1 | head -2 | tail -1`
-	BTRFS=`blkid | grep $HARD_DISK | sort | cut -d ":" -f1 | head -3 | tail -1`
+	EFI=$(blkid | grep $HARD_DISK | sort | cut -d ":" -f1 | head -1 | tail -1)
+	BOOT=$(blkid | grep $HARD_DISK | sort | cut -d ":" -f1 | head -2 | tail -1)
+	BTRFS=$(blkid | grep $HARD_DISK | sort | cut -d ":" -f1 | head -3 | tail -1)
 }
 partitionDetection
 
@@ -66,14 +73,14 @@ auto_login() {
 
 create-os-snapshots() {
 	echo
-		mkdir $2
-		echo "[Creating new OS snapshot to $2/$3.tgz]"
-		echo
-		echo
-		NEW_TAR_EXCLUDES="$TAR_EXCLUDES --exclude=$TARGET/*"
-		echo
-		time tar cpzf $2/$3.tgz $NEW_TAR_EXCLUDES /
-		chown $USER:$USER $2/$3.tgz
+	mkdir $2
+	echo "[Creating new OS snapshot to $2/$3.tgz]"
+	echo
+	echo
+	NEW_TAR_EXCLUDES="$TAR_EXCLUDES --exclude=$TARGET/*"
+	echo
+	time tar cpzf $2/$3.tgz $NEW_TAR_EXCLUDES /
+	chown $USER:$USER $2/$3.tgz
 }
 
 homeBackup() {
@@ -253,7 +260,8 @@ desktop() {
 	done
 
 	apt -y purge apparmor
-	apt remove unattended-upgrades chromium chromium-common chromium-sandbox epiphany-browser epiphany-browser-data -y
+	apt remove unattended-upgrades firefox-esr chromium chromium-common chromium-sandbox epiphany-browser epiphany-browser-data -y
+	installBrowser
 	apt autoremove -y
 }
 
@@ -472,7 +480,9 @@ initialize-disk() {
 	echo
 	echo "Formatting....."
 	echo y | mkfs.btrfs /dev/mapper/$ROOT_MAPPER_NAME --force
-	echo;echo "Initialize Complete. Please reboot your machine to avoid any issues";echo
+	echo
+	echo "Initialize Complete. Please reboot your machine to avoid any issues"
+	echo
 }
 
 wifi() {