diff --git a/setup/fedora b/setup/fedora index 2ab4866..f506d15 100755 --- a/setup/fedora +++ b/setup/fedora @@ -1,9 +1,19 @@ #!/usr/bin/env bash -ver="3.1.2_fedoraws_gen4.1_git.tyleo.dev" + +wget -q --spider https://scr.tyleo.dev + +if [ $? -eq 0 ]; then + echo "> Connected to tyleo.dev domain ok. " +else + echo "> Connect to Internet and Try Again. " + exit +fi + Arg1=$1 wget scr.tyleo.dev/setup/fedora -O ./fedora &>/dev/null +ver="3.2.1_fedoraws_gen4.1_git.tyleo.dev" clear # Functions @@ -109,7 +119,7 @@ sudo fedora-third-party refresh sudo dnf remove -y gnome-text-editor sudo dnf install -y gedit sudo dnf in -y "https://hst.tyleo.dev/packages/rpm/ocs-url_fc20.rpm" -sudo dnf in -y rsnapshot lshw lshw-gui id3v2 switchdesk switchdesk-gui go ruby subfinder engrampa flatpak nmap nmtui gparted duf alien aria2 micro gnome-boxes ptyxis timeshift pwgen ncdu htop btop glances figlet fish zsh gimp openshot google-chrome-stable distrobox docker docker-compose gnome-software +sudo dnf in -y rsnapshot lshw lshw-gui id3v2 switchdesk switchdesk-gui go ruby subfinder engrampa flatpak nmap nmtui gparted duf alien aria2 micro gnome-boxes ptyxis timeshift pwgen ncdu htop btop glances figlet fish zsh gimp openshot distrobox docker docker-compose gnome-software sudo dnf in -y gnome-tweaks sudo dnf in -y ffmpeg # Visual Studio Code (RPM Version) @@ -343,15 +353,16 @@ unreg-reg-script() { } install-vpn-client() { -sudo tee /etc/yum.repos.d/pritunl.repo << EOF -[pritunl] -name=Pritunl Repository -baseurl=https://repo.pritunl.com/stable/yum/fedora/41/ -gpgcheck=1 -enabled=1 -gpgkey=https://raw.githubusercontent.com/pritunl/pgp/master/pritunl_repo_pub.asc -EOF -sudo dnf install pritunl-client-electron -y +# sudo tee /etc/yum.repos.d/pritunl.repo << EOF +# [pritunl] +# name=Pritunl Repository +# baseurl=https://repo.pritunl.com/stable/yum/fedora/41/ +# gpgcheck=1 +# enabled=1 +# gpgkey=https://raw.githubusercontent.com/pritunl/pgp/master/pritunl_repo_pub.asc +# EOF +# sudo dnf install pritunl-client-electron -y +sudo dnf remove pritunl-client-electron -y } update-fonts-package() { @@ -742,12 +753,32 @@ if [[ $Arg1 = "--auto" ]]||[[ $Arg1 = "-a" ]]; then exit fi +exterminate_chrome() { + echo "Removing Google Chrome" + sudo killall chrome google-chrome google-chrome-stable + sudo dnf remove -y google-chrome-stable + sudo rm -fv /etc/yum.repos.d/google-chrome.repo +} + +setup_brave() { + sudo dnf config-manager addrepo --from-repofile=https://brave-browser-rpm-release.s3.brave.com/brave-browser.repo + sudo dnf config-manager addrepo --from-repofile=https://brave-browser-rpm-beta.s3.brave.com/brave-browser-beta.repo + sudo dnf config-manager addrepo --from-repofile=https://brave-browser-rpm-nightly.s3.brave.com/brave-browser-nightly.repo + sudo dnf makecache + sudo dnf in -y brave-browser brave-browser-beta brave-browser-nightly + # Addon for replacing Chrome commands by Brave, allowing seamless transfer. + echo 'brave-browser "$@"' | sudo tee /bin/google-chrome + cp -v /usr/share/applications/brave-browser.desktop /usr/share/applications/google-chrome.desktop + sudo cp -fv /bin/google-chrome /bin/google-chrome-stable + sudo chmod -v +x /bin/google-chrome* +} + setup_font() { # Setup Oxanium Font -gsettings set org.gnome.desktop.interface document-font-name 'SF Pro Display' -gsettings set org.gnome.desktop.interface font-name 'SF Pro Display' -gsettings set org.gnome.desktop.interface monospace-font-name 'JetBrains Mono' -gsettings set org.gnome.desktop.interface text-scaling-factor '1.2' +gsettings set org.gnome.desktop.interface document-font-name 'SF Pro Display Regular' +gsettings set org.gnome.desktop.interface font-name 'SF Pro Display Regular' +gsettings set org.gnome.desktop.interface monospace-font-name 'JetBrains Mono Regular' +gsettings set org.gnome.desktop.interface text-scaling-factor '1.3' } @@ -810,6 +841,8 @@ choice=$(whiptail --title "Fedora Workstation Setup | v$ver $menumode" --nocance "W" " Install/Update WLCM & RegScript" \ "R" " Register this system (-r/--register)" \ "" "" \ +"Brave" " Install or Update Brave Browser" \ +"" "" \ "1" " Update System Packages & Configuration" \ "2" " Update Flatpak Packages & Configuration" \ "3" " Update Fontpack Configuration" \ @@ -864,6 +897,19 @@ if [[ $choice = 7 ]]; then reload-script fi +if [[ $choice = "Brave" ]]; then + title="Brave Browser Deployment" + show_header + header-show + wait-3s + enable-cmd-mode + exterminate_chrome + setup_brave + disable-cmd-mode + wait-for-keypress + reload-script +fi + if [[ $choice = SB ]]; then open_secure_backup reload-script @@ -910,6 +956,8 @@ if [[ $choice = A ]]; then update-system-packages update-personnal-packages install_nautilus + exterminate_chrome + setup_brave setup_netdata install-vpn-client update-flatpak-packages