Removed "com.discordapp.Discord" from the FLATPAK_PACKAGES array.
2.
Added a new install_discord function that installs the Discord RPM directly using the link provided.
3.
Updated the main menu and switch cases (options 1, 2, and 11) to include the install_discord step and execute it when running the installation commands.
This commit is contained in:
2026-05-16 09:18:51 -07:00
parent fca58a98c7
commit 3c1fc38fae
+28 -11
View File
@@ -29,10 +29,10 @@ DNF_PACKAGES=(
"mpv" "mpv"
"fuse" "fuse"
"fuse-libs" "fuse-libs"
"nodejs24"
) )
FLATPAK_PACKAGES=( FLATPAK_PACKAGES=(
"com.discordapp.Discord"
"com.github.tchx84.Flatseal" "com.github.tchx84.Flatseal"
"net.nokyan.Resources" "net.nokyan.Resources"
"com.mattjakeman.ExtensionManager" "com.mattjakeman.ExtensionManager"
@@ -199,8 +199,8 @@ install_repos() {
log_info "----------------------------------------------------" log_info "----------------------------------------------------"
sudo dnf install -y \ sudo dnf install -y \
https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \ "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 "https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm"
check_status "RPM Fusion repositories installation" "non-critical" check_status "RPM Fusion repositories installation" "non-critical"
} }
@@ -258,6 +258,19 @@ install_software() {
check_status "gemini-cli installation" "non-critical" check_status "gemini-cli installation" "non-critical"
} }
install_discord() {
log_info "----------------------------------------------------"
log_info "Installing Discord"
log_info "----------------------------------------------------"
if rpm -q discord > /dev/null 2>&1; then
log_info "Discord already installed."
else
log_info "Downloading and installing Discord..."
sudo dnf install -y "https://discord.com/api/download?platform=linux&format=rpm"
check_status "Discord installation" "non-critical"
fi
}
install_1password() { install_1password() {
log_info "----------------------------------------------------" log_info "----------------------------------------------------"
log_info "Installing 1Password" log_info "Installing 1Password"
@@ -275,7 +288,7 @@ install_Windscribe() {
log_info "----------------------------------------------------" log_info "----------------------------------------------------"
log_info "Installing Windscribe" log_info "Installing Windscribe"
log_info "----------------------------------------------------" log_info "----------------------------------------------------"
if rpm -q 1password > /dev/null 2>&1; then if rpm -q windscribe-cli > /dev/null 2>&1 || command_exists windscribe; then
log_info "Windscribe already installed." log_info "Windscribe already installed."
else else
log_info "Downloading and installing Windscribe..." log_info "Downloading and installing Windscribe..."
@@ -473,12 +486,13 @@ show_menu() {
echo "8. Install LinuxToys" echo "8. Install LinuxToys"
echo "9. Install Shell Environment (Starship, MyBash)" echo "9. Install Shell Environment (Starship, MyBash)"
echo "10. Install GNOME Extensions" echo "10. Install GNOME Extensions"
echo "11. Install 1Password" echo "11. Install Discord"
echo "12. Install Windscribe" echo "12. Install 1Password"
echo "13. Install Topgrade" echo "13. Install Windscribe"
echo "14. Install Topgrade"
echo "0. Exit" echo "0. Exit"
echo "====================================================" echo "===================================================="
read -p "Enter your choice [0-10]: " choice read -p "Enter your choice [0-14]: " choice
} }
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@@ -500,6 +514,7 @@ while true; do
install_fonts install_fonts
install_repos install_repos
install_software install_software
install_discord
install_1password install_1password
install_Windscribe install_Windscribe
install_topgrade install_topgrade
@@ -515,6 +530,7 @@ while true; do
install_fonts install_fonts
install_repos install_repos
install_software install_software
install_discord
install_1password install_1password
install_Windscribe install_Windscribe
install_topgrade install_topgrade
@@ -533,9 +549,10 @@ while true; do
8) install_linuxtoys ;; 8) install_linuxtoys ;;
9) install_shell_env ;; 9) install_shell_env ;;
10) install_gnome_extensions ;; 10) install_gnome_extensions ;;
11) install_1password ;; 11) install_discord ;;
12) install_Windscribe ;; 12) install_1password ;;
13) install_topgrade ;; 13) install_Windscribe ;;
14) install_topgrade ;;
0) 0)
log_info "Exiting..." log_info "Exiting..."
exit 0 exit 0