From dad9b4a2341f48e14c80b1b5f51f2730fb89c679 Mon Sep 17 00:00:00 2001 From: Jeevitha Kannan K S Date: Sun, 20 Oct 2024 15:36:25 +0530 Subject: [PATCH 1/4] fix: debian gaming deps --- core/tabs/system-setup/gaming-setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/tabs/system-setup/gaming-setup.sh b/core/tabs/system-setup/gaming-setup.sh index 92c666c7..017ce8e8 100755 --- a/core/tabs/system-setup/gaming-setup.sh +++ b/core/tabs/system-setup/gaming-setup.sh @@ -26,7 +26,7 @@ installDepend() { $AUR_HELPER -S --needed --noconfirm $DEPENDENCIES $DISTRO_DEPS ;; apt-get|nala) - DISTRO_DEPS="libasound2 libsdl2 wine64 wine32" + DISTRO_DEPS="libasound2 libsdl2-2.0-0 wine64 wine32" "$ESCALATION_TOOL" "$PACKAGER" update "$ESCALATION_TOOL" dpkg --add-architecture i386 @@ -71,7 +71,7 @@ installAdditionalDepend() { curl -sSLo "lutris_${version_no_v}_all.deb" "https://github.com/lutris/lutris/releases/download/${version}/lutris_${version_no_v}_all.deb" printf "%b\n" "${YELLOW}Installing Lutris...${RC}" - "$ESCALATION_TOOL" "$PACKAGER" install ./lutris_"${version_no_v}"_all.deb + "$ESCALATION_TOOL" "$PACKAGER" install -y ./lutris_"${version_no_v}"_all.deb rm lutris_"${version_no_v}"_all.deb From df008d63e326ce5e08886add0426bf60196990c5 Mon Sep 17 00:00:00 2001 From: Jeevitha Kannan K S Date: Sun, 20 Oct 2024 21:33:35 +0530 Subject: [PATCH 2/4] fix: pop-os gaming dependency issue --- core/tabs/system-setup/gaming-setup.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/core/tabs/system-setup/gaming-setup.sh b/core/tabs/system-setup/gaming-setup.sh index 017ce8e8..f6757c7c 100755 --- a/core/tabs/system-setup/gaming-setup.sh +++ b/core/tabs/system-setup/gaming-setup.sh @@ -3,8 +3,7 @@ . ../common-script.sh installDepend() { - # Check for dependencies - DEPENDENCIES='wine dbus' + DEPENDENCIES='wine dbus git' printf "%b\n" "${YELLOW}Installing dependencies...${RC}" case "$PACKAGER" in pacman) @@ -26,12 +25,12 @@ installDepend() { $AUR_HELPER -S --needed --noconfirm $DEPENDENCIES $DISTRO_DEPS ;; apt-get|nala) - DISTRO_DEPS="libasound2 libsdl2-2.0-0 wine64 wine32" + DISTRO_DEPS="software-properties-common libasound2 libsdl2-2.0-0 wine64 wine32" - "$ESCALATION_TOOL" "$PACKAGER" update "$ESCALATION_TOOL" dpkg --add-architecture i386 - "$ESCALATION_TOOL" "$PACKAGER" install -y software-properties-common - "$ESCALATION_TOOL" apt-add-repository contrib -y + if [ "$DTYPE" != "pop" ]; then + "$ESCALATION_TOOL" apt-add-repository contrib -y + fi "$ESCALATION_TOOL" "$PACKAGER" update "$ESCALATION_TOOL" "$PACKAGER" install -y $DEPENDENCIES $DISTRO_DEPS ;; @@ -50,7 +49,8 @@ installDepend() { "$ESCALATION_TOOL" "$PACKAGER" -n install $DEPENDENCIES ;; *) - "$ESCALATION_TOOL" "$PACKAGER" install -y $DEPENDENCIES + printf "%b\n" "${RED}Unsupported package manager ${PACKAGER}${RC}" + exit 1 ;; esac } @@ -90,11 +90,12 @@ installAdditionalDepend() { "$ESCALATION_TOOL" "$PACKAGER" install -y $DISTRO_DEPS ;; zypper) - # Flatpak DISTRO_DEPS='lutris' "$ESCALATION_TOOL" "$PACKAGER" -n install $DISTRO_DEPS ;; *) + printf "%b\n" "${RED}Unsupported package manager ${PACKAGER}${RC}" + exit 1 ;; esac } From ff44b7095f150172fc4e4dec2e7d7c1e7ec311d3 Mon Sep 17 00:00:00 2001 From: JEEVITHA KANNAN K S Date: Mon, 21 Oct 2024 21:44:12 +0530 Subject: [PATCH 3/4] Update gaming-setup.sh --- core/tabs/system-setup/gaming-setup.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/tabs/system-setup/gaming-setup.sh b/core/tabs/system-setup/gaming-setup.sh index f6757c7c..4b2d920c 100755 --- a/core/tabs/system-setup/gaming-setup.sh +++ b/core/tabs/system-setup/gaming-setup.sh @@ -25,12 +25,15 @@ installDepend() { $AUR_HELPER -S --needed --noconfirm $DEPENDENCIES $DISTRO_DEPS ;; apt-get|nala) - DISTRO_DEPS="software-properties-common libasound2 libsdl2-2.0-0 wine64 wine32" + DISTRO_DEPS="libasound2 libsdl2-2.0-0 wine64 wine32" "$ESCALATION_TOOL" dpkg --add-architecture i386 + if [ "$DTYPE" != "pop" ]; then + "$ESCALATION_TOOL" "$PACKAGER" install -y software-properties-common "$ESCALATION_TOOL" apt-add-repository contrib -y fi + "$ESCALATION_TOOL" "$PACKAGER" update "$ESCALATION_TOOL" "$PACKAGER" install -y $DEPENDENCIES $DISTRO_DEPS ;; From 75652b483f722780e6eb42cfa4a732b7bf2d7058 Mon Sep 17 00:00:00 2001 From: Jeevitha Kannan K S Date: Wed, 6 Nov 2024 06:34:40 +0530 Subject: [PATCH 4/4] fix: shellcheck warning , formatting --- core/tabs/system-setup/gaming-setup.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/tabs/system-setup/gaming-setup.sh b/core/tabs/system-setup/gaming-setup.sh index d350c419..ecd97c54 100755 --- a/core/tabs/system-setup/gaming-setup.sh +++ b/core/tabs/system-setup/gaming-setup.sh @@ -1,5 +1,7 @@ #!/bin/sh -e +# shellcheck disable=SC2086 + . ../common-script.sh installDepend() { @@ -24,7 +26,7 @@ installDepend() { $AUR_HELPER -S --needed --noconfirm $DEPENDENCIES $DISTRO_DEPS ;; - apt-get|nala) + apt-get | nala) DISTRO_DEPS="libasound2-plugins:i386 libsdl2-2.0-0:i386 libdbus-1-3:i386 libsqlite3-0:i386 wine64 wine32" "$ESCALATION_TOOL" dpkg --add-architecture i386 @@ -64,7 +66,7 @@ installAdditionalDepend() { DISTRO_DEPS='steam lutris goverlay' "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm $DISTRO_DEPS ;; - apt-get|nala) + apt-get | nala) version=$(git -c 'versionsort.suffix=-' ls-remote --tags --sort='v:refname' https://github.com/lutris/lutris | grep -v 'beta' | tail -n1 |