diff --git a/debian.sh b/debian.sh index 49ca14d..ad74dd2 100755 --- a/debian.sh +++ b/debian.sh @@ -49,7 +49,7 @@ BASE_PACKAGES=" firmware-realtek neofetch linux-image-amd64 grub-efi efibootmgr KDE_DESKTOP_ENV=" krita libdbus-glib-1-2 calligra print-manager plasma-discover-backend-flatpak 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_DESKTOP_ENV=" gnome-core gnome-music gdm3 gnome-shell-extension-no-annonyance gnome-shell-extension-dash-to-panel gnome-shell-extension-weather gnome-shell-extension-dashtodock gnome-shell-extension-appindicator gnome-tweaks synaptic gimp " +GNOME_DESKTOP_ENV=" gnome gnome-music 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=" keepassxc telegram-desktop handbrake vlc nextcloud-desktop yt-dlp " #VIRTUALIZATION=" virt-manager qemu-system libvirt-daemon-system ovmf cockpit-machines" PACKAGES="" @@ -498,36 +498,50 @@ installSteam() { apt install lutris -y } -installBrowser() { - #Brave +installBrave() { 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 + apt remove -y firefox-esr + apt autoremove -y +} - #apt install -y firefox-esr +installChrome() { + curl -fSsL https://dl.google.com/linux/linux_signing_key.pub | gpg --dearmor | tee /usr/share/keyrings/google-chrome.gpg >>/dev/null + echo deb [arch=amd64 signed-by=/usr/share/keyrings/google-chrome.gpg] http://dl.google.com/linux/chrome/deb/ stable main | tee /etc/apt/sources.list.d/google-chrome.list + apt update + apt install -y google-chrome-stable +} - #Firefox - #installFirefox - #installFirefoxNightly +installVivaldi() { + curl -fsSL https://repo.vivaldi.com/archive/linux_signing_key.pub | gpg --dearmor | tee /usr/share/keyrings/vivaldi.gpg >/dev/null + echo deb [arch=amd64,armhf signed-by=/usr/share/keyrings/vivaldi.gpg] https://repo.vivaldi.com/archive/deb/ stable main | sudo tee /etc/apt/sources.list.d/vivaldi.list + apt update + apt install -y vivaldi-stable +} - #Chrome - #curl -fSsL https://dl.google.com/linux/linux_signing_key.pub | gpg --dearmor | tee /usr/share/keyrings/google-chrome.gpg >> /dev/null - #echo deb [arch=amd64 signed-by=/usr/share/keyrings/google-chrome.gpg] http://dl.google.com/linux/chrome/deb/ stable main | tee /etc/apt/sources.list.d/google-chrome.list - #apt update - #apt install -y google-chrome-stable +installEdge() { + curl -fSsL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /usr/share/keyrings/microsoft-edge.gpg >/dev/null + echo 'deb [signed-by=/usr/share/keyrings/microsoft-edge.gpg] https://packages.microsoft.com/repos/edge stable main' | tee /etc/apt/sources.list.d/microsoft-edge.list + apt update -y + apt install microsoft-edge-stable -y +} - #Vivaldi - #curl -fsSL https://repo.vivaldi.com/archive/linux_signing_key.pub | gpg --dearmor | tee /usr/share/keyrings/vivaldi.gpg >/dev/null - #echo deb [arch=amd64,armhf signed-by=/usr/share/keyrings/vivaldi.gpg] https://repo.vivaldi.com/archive/deb/ stable main | sudo tee /etc/apt/sources.list.d/vivaldi.list - #apt update - #apt install -y vivaldi-stable - - #Edge - #curl -fSsL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /usr/share/keyrings/microsoft-edge.gpg >/dev/null - #echo 'deb [signed-by=/usr/share/keyrings/microsoft-edge.gpg] https://packages.microsoft.com/repos/edge stable main' | tee /etc/apt/sources.list.d/microsoft-edge.list - #apt update -y - #apt install microsoft-edge-stable -y +installBrowser() { + if [ "$BROWSER" = "brave" ]; then + installBrave + elif [ "$BROWSER" = "edge" ]; then + installEdge + elif [ "$BROWSER" = "firefox" ]; then + installFirefox + elif [ "$BROWSER" = "firefox-nightly" ]; then + installFirefoxNightly + elif [ "$BROWSER" = "vivaldi" ]; then + installVivaldi + else + apt install -y firefox-esr + fi } installElement() {