From b6f920878c96293609dd5df2060fad9eaac82744 Mon Sep 17 00:00:00 2001 From: askiiart Date: Wed, 6 Dec 2023 21:47:27 -0600 Subject: [PATCH] Update fedora stuff --- distro-specific.bash | 3 ++- dotfiles | 2 +- install-stuff/install-librewolf.bash | 2 +- install-stuff/install-misc.sh | 6 ++++-- install-stuff/install-steam.bash | 2 +- install-stuff/install-vesktop.bash | 5 +++-- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/distro-specific.bash b/distro-specific.bash index 45bd54e..c30e393 100755 --- a/distro-specific.bash +++ b/distro-specific.bash @@ -10,8 +10,9 @@ command_exists() { type "$1" &>/dev/null; } if command_exists "apt-get"; then sudo apt update sudo apt install curl -y -elif command_exists "yum"; then +elif command_exists "dnf"; then sudo dnf config-manager --add-repo https://askiiart.net/repos/fedora/x86_64/askiiart.repo + sudo dnf remove libreoffice* firefox atril -y sudo dnf install https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm elif command_exists "pacman"; then WD=$(pwd) diff --git a/dotfiles b/dotfiles index 4139aa4..f2df853 160000 --- a/dotfiles +++ b/dotfiles @@ -1 +1 @@ -Subproject commit 4139aa43087459afa073b79ff104e0f8e0b2f681 +Subproject commit f2df8532350274f1eb9304d5e181938026bb3116 diff --git a/install-stuff/install-librewolf.bash b/install-stuff/install-librewolf.bash index 452e905..ba1ba94 100755 --- a/install-stuff/install-librewolf.bash +++ b/install-stuff/install-librewolf.bash @@ -14,7 +14,7 @@ if command_exists "apt-get"; then echo "Types: deb\nURIs: https://deb.librewolf.net\nSuites: $distro\nComponents: main\nArchitectures: amd64\nSigned-By: /usr/share/keyrings/librewolf.gpg" | sudo tee /etc/apt/sources.list.d/librewolf.sources sudo apt update sudo apt install librewolf -y -elif command_exists "yum"; then +elif command_exists "dnf"; then sudo dnf config-manager --add-repo https://rpm.librewolf.net/librewolf-repo.repo sudo dnf install librewolf elif command_exists "pacman"; then diff --git a/install-stuff/install-misc.sh b/install-stuff/install-misc.sh index bb68b78..dd1b2b8 100755 --- a/install-stuff/install-misc.sh +++ b/install-stuff/install-misc.sh @@ -14,8 +14,10 @@ if command_exists "apt-get"; then sudo apt-get install kitty -y echo "Please install SchildiChat, nvim/neovim" elif command_exists "yum"; then - sudo yum install kitty -y - echo "Please install SchildiChat, nvim/neovim" + sudo yum install kitty neovim -y + curl -LO $(curl -s https://api.github.com/repos/SchildiChat/schildichat-desktop/releases/latest | grep "browser_download_url.*schildichat-desktop-.*.x86_64.rpm" | cut -d : -f 2,3 | tr -d \") + sudo dnf install ./schildichat-desktop-*.x86_64.rpm + sudo rm ./schildichat-desktop-*.x86_64.rpm elif command_exists "yay"; then yay -S kitty schildichat-desktop-bin digikam eog man-db neovim --noconfirm --needed elif command_exists "zypp"; then diff --git a/install-stuff/install-steam.bash b/install-stuff/install-steam.bash index 7a03cd6..d582156 100755 --- a/install-stuff/install-steam.bash +++ b/install-stuff/install-steam.bash @@ -11,7 +11,7 @@ command_exists() { type "$1" &>/dev/null; } if command_exists "apt-get"; then curl -LO https://cdn.cloudflare.steamstatic.com/client/installer/steam.deb sudo dpkg -i steam.deb -elif command_exists "yum"; then +elif command_exists "dnf"; then sudo dnf install steam -y elif command_exists "yay"; then #printf '[multilib]\nInclude = /etc/pacman.d/mirrorlist\n' diff --git a/install-stuff/install-vesktop.bash b/install-stuff/install-vesktop.bash index f30bd37..cc0c7da 100755 --- a/install-stuff/install-vesktop.bash +++ b/install-stuff/install-vesktop.bash @@ -11,8 +11,9 @@ if command_exists "apt-get"; then curl $(curl -s https://api.github.com/repos/Vencord/Vesktop/releases/latest | grep "VencordDesktop_.*_amd64.deb" | head --lines 1 | cut -d : -f 2,3 | tr -d \") -LO sudo apt-get install ./VencordDesktop_*.deb -y elif command_exists "yum"; then - curl $(curl -s https://api.github.com/repos/Vencord/Vesktop/releases/latest | grep "VencordDesktop-.*.x86_64.rpm" | head --lines 1 | cut -d : -f 2,3 | tr -d \") -LO - sudo apt install ./VencordDesktop*.rpm -y + curl -LO $(curl -s https://api.github.com/repos/Vencord/Vesktop/releases/latest | grep "browser_download_url.*VencordDesktop-.*.x86_64.rpm" | head --lines 1 | cut -d : -f 2,3 | tr -d \") + sudo dnf install ./VencordDesktop*.rpm -y + rm ./VencordDesktop*.rpm elif command_exists "pacman"; then yay -S vencord-desktop-bin --noconfirm --needed else