From 66775c6cab3e789cf77ac514fa9514c6c31743b7 Mon Sep 17 00:00:00 2001 From: the-sane <3657071+the-sane@users.noreply.github.com> Date: Tue, 23 May 2023 21:42:33 -0400 Subject: [PATCH] Lutris 0.5.13 fixed version detection --- lug-helper.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/lug-helper.sh b/lug-helper.sh index 94c8c25..cbd2e19 100755 --- a/lug-helper.sh +++ b/lug-helper.sh @@ -857,16 +857,12 @@ lutris_check() { return 1 fi - # TODO: This was reported and fixed. Verify and remove when v0.5.13 is released - if [ "$(pgrep -f lutris)" ]; then - preflight_fail+=("Unable to detect Lutris version info while it is running.\nVersion $lutris_required or newer is required.") - return 1 - fi - # Check the native lutris version number if [ "$lutris_native" = "true" ]; then lutris_current="$(lutris -v | awk -F '-' '{print $2}')" - if [ "$lutris_required" != "$lutris_current" ] && + if [ -z "$lutris_current" ]; then + preflight_fail+=("Unable to detect Lutris version info.\nVersion $lutris_required or newer is required.") + elif [ "$lutris_required" != "$lutris_current" ] && [ "$lutris_current" = "$(printf "%s\n%s" "$lutris_current" "$lutris_required" | sort -V | head -n1)" ]; then preflight_fail+=("Lutris is out of date.\nVersion $lutris_required or newer is required.") else @@ -877,7 +873,9 @@ lutris_check() { # Check the flatpak lutris version number if [ "$lutris_flatpak" = "true" ]; then lutris_current="$(flatpak run net.lutris.Lutris -v | awk -F '-' '{print $2}')" - if [ "$lutris_required" != "$lutris_current" ] && + if [ -z "$lutris_current" ]; then + preflight_fail+=("Unable to detect Flatpak Lutris version info.\nVersion $lutris_required or newer is required.") + elif [ "$lutris_required" != "$lutris_current" ] && [ "$lutris_current" = "$(printf "%s\n%s" "$lutris_current" "$lutris_required" | sort -V | head -n1)" ]; then preflight_fail+=("Flatpak Lutris is out of date.\nVersion $lutris_required or newer is required.") else