From a3eee82a30dcc79639400ed0bbbdf2964ecdb01b Mon Sep 17 00:00:00 2001 From: Nacroni <60831747+Nacroni@users.noreply.github.com> Date: Fri, 8 Nov 2024 13:34:49 -0500 Subject: use "dnf4" instead of generic "dnf" Fedora 41 changes the version of the generic "dnf" to dnf5 (which doesn't support "group install"), so directly pointing to dnf4 might help with installing dependencies. --- install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'install.sh') diff --git a/install.sh b/install.sh index bbf19de..61c61da 100755 --- a/install.sh +++ b/install.sh @@ -16,7 +16,7 @@ elif [ -f /usr/bin/zypper ]; then distro="suse" elif [ -f /usr/bin/pacman ]; then distro="arch" -elif [ -f /usr/bin/dnf ]; then +elif [ -f /usr/bin/dnf4 ]; then distro="fedora" elif [ -f /sbin/apk ]; then distro="alpine" @@ -35,7 +35,7 @@ fi echo "Installing, this may take some time...." # Fedora with the terra repo (Ultramarine) has keyd packaged -[ "$distro" = "fedora" ] && dnf info keyd -y&>> pkg.log && FEDORA_HAS_KEYD=1 +[ "$distro" = "fedora" ] && dnf4 info keyd -y&>> pkg.log && FEDORA_HAS_KEYD=1 if ! [ -f /usr/bin/keyd ]; then # if keyd isnt installed @@ -45,7 +45,7 @@ if ! [ -f /usr/bin/keyd ]; then $privesc apt install -y build-essential git &>> pkg.log ;; fedora) - [ ! "$FEDORA_HAS_KEYD" = "1" ] && $privesc dnf groupinstall -y "Development Tools" "Development Libraries" &>> pkg.log + [ ! "$FEDORA_HAS_KEYD" = "1" ] && $privesc dnf4 groupinstall -y "Development Tools" "Development Libraries" &>> pkg.log ;; esac @@ -62,7 +62,7 @@ if ! [ -f /usr/bin/keyd ]; then ;; *) if [ "$FEDORA_HAS_KEYD" = "1" ]; then - $privesc dnf install -y keyd &>> pkg.log + $privesc dnf4 install -y keyd &>> pkg.log else git clone https://github.com/rvaiya/keyd &>> pkg.log cd keyd -- cgit 1.4.1-2-gfad0