From 3b8e49ff4e200cbc97785f825831d673b28de77a Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sat, 13 Jul 2024 13:54:39 -0600
Subject: [PATCH] fix

---
 debian.sh | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/debian.sh b/debian.sh
index ca409a3..6a170b7 100755
--- a/debian.sh
+++ b/debian.sh
@@ -44,18 +44,17 @@ COMPRESSION='compress=zstd:10'
 AUTO_DECRYPT='True'
 FLATPAKS+=(io.exodus.Exodus us.zoom.Zoom)
 DESKTOP="GNOME"
-BROWSER="firefox-esr"
+BROWSER="librewolf"
 #Packages
 BASE_PACKAGES=" syncthing tor firmware-realtek screenfetch linux-image-amd64 grub-efi efibootmgr plymouth plymouth-themes duperemove btrfs-compsize btrfs-progs cryptsetup-initramfs linux-headers-amd64 firmware-iwlwifi firmware-linux firmware-linux-nonfree packagekit cockpit-packagekit cockpit-storaged shfmt aardvark-dns power-profiles-daemon iptables-persistent resolvconf wireguard wireguard-tools nmap libsecret-tools libglu1-mesa preload powertop acpi btop inotify-tools debootstrap cups apt-transport-https samba samba-common nfs-common nfs-kernel-server linux-cpupower locales zram-tools acpid 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 "
 KDE_DESKTOP_ENV=" krita libdbus-glib-1-2 korganizer print-manager kwin-addons kde-standard konsole dolphin kde-spectacle "
 XFCE_DESKTOP_ENV=" xfce4 xfce4-goodies xfce4-whiskermenu-plugin xfce4-pulseaudio-plugin slim "
-CINNAMON_DESKTOP_ENV=" cinnamon slim gimp gnome-screenshot gimp "
-GNOME_DESKTOP_ENV=" gnome-calendar xournalpp gnome-core gdm3 gnome-shell-extension-arc-menu gnome-shell-extension-desktop-icons-ng gnome-shell-extension-tiling-assistant gnome-shell-extension-no-annoyance gnome-shell-extension-dash-to-panel gnome-shell-extension-weather gnome-shell-extension-dashtodock gnome-shell-extension-appindicator gnome-tweaks synaptic gimp "
-SHARED_DESKTOP_APPS=" obs-studio keepassxc telegram-desktop handbrake vlc yt-dlp "
+CINNAMON_DESKTOP_ENV=" cinnamon slim gnome-screenshot "
+GNOME_DESKTOP_ENV=" gnome-calendar xournalpp gnome-core gdm3 gnome-shell-extension-tiling-assistant gnome-tweaks synaptic "
+SHARED_DESKTOP_APPS=" krita obs-studio keepassxc telegram-desktop handbrake vlc yt-dlp "
 VIRTUALIZATION=" virt-manager qemu-system libvirt-daemon-system ovmf cockpit-machines"
 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/postgresql --exclude=/var/lib/containers "
-
+TAR_EXCLUDES=" --exclude=/media --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/postgresql --exclude=/var/lib/containers "
 
 partitionDetection() {
 	#This is used for the installer to do script-based actions
@@ -106,7 +105,7 @@ create-os-snapshots() {
 	echo
 	NEW_TAR_EXCLUDES="$TAR_EXCLUDES --exclude=/minio --exclude=$TARGET/* --exclude=/var/lib/docker "
 	echo
-	time tar cpzf $2/$3.tgz $NEW_TAR_EXCLUDES /
+	time tar cpzvf $2/$3.tgz $NEW_TAR_EXCLUDES /
 	chown $USER:$USER $2/$3.tgz
 }
 
@@ -274,9 +273,9 @@ install() {
 	unmount
 }
 
-installStableDiffusion(){
+installStableDiffusion() {
 	VERSION="3.11"
-	apt update 
+	apt update
 	apt install -y python$VERSION python$VERSION-venv
 	apt update
 	apt install -y $STABLE_DIFFUSION
@@ -455,6 +454,21 @@ installFirefoxNightly() {
 	apt install firefox-nightly -y
 }
 
+installLibreWolf() {
+	distro=$(if echo " una bookworm vanessa focal jammy bullseye vera uma " | grep -q " $(lsb_release -sc) "; then lsb_release -sc; else echo focal; fi)
+	wget -O- https://deb.librewolf.net/keyring.gpg | gpg --dearmor -o /usr/share/keyrings/librewolf.gpg
+	tee /etc/apt/sources.list.d/librewolf.sources <<EOF >/dev/null
+Types: deb
+URIs: https://deb.librewolf.net
+Suites: $distro
+Components: main
+Architectures: amd64
+Signed-By: /usr/share/keyrings/librewolf.gpg
+EOF
+	apt update
+	apt install -y librewolf
+}
+
 installFirefoxESR() {
 	apt install -y firefox-esr
 }
@@ -510,10 +524,10 @@ installEdge() {
 installBrowser() {
 	if [ "$BROWSER" = "brave" ]; then
 		installBrave
+	elif [ "$BROWSER" = "librewolf" ]; then
+		installLibreWolf
 	elif [ "$BROWSER" = "edge" ]; then
 		installEdge
-	elif [ "$BROWSER" = "firefox-esr" ]; then
-		installFirefoxESR
 	elif [ "$BROWSER" = "firefox" ]; then
 		installFirefox
 	elif [ "$BROWSER" = "firefox-nightly" ]; then
@@ -521,7 +535,7 @@ installBrowser() {
 	elif [ "$BROWSER" = "vivaldi" ]; then
 		installVivaldi
 	else
-		apt install -y firefox-esr
+		installFirefoxESR
 	fi
 }