From 97a33d8d1ae6b3a819ada6881449c25efca47ba8 Mon Sep 17 00:00:00 2001 From: Daniele Scasciafratte Date: Fri, 15 Mar 2024 14:40:57 +0100 Subject: [PATCH 1/7] feat(detect): if steam and yad not found stop the program --- steamtinkerlaunch | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/steamtinkerlaunch b/steamtinkerlaunch index d405a915..8d159f17 100755 --- a/steamtinkerlaunch +++ b/steamtinkerlaunch @@ -619,6 +619,12 @@ function setSteamPath { } function setSteamPaths { + if [ ! -x "$(command -v "steam")" ]; then + echo "ERROR" "${FUNCNAME[0]} - Steam not found" + writelog "ERROR" "${FUNCNAME[0]} - Steam not found" + exit 0 + fi + if [ -f "$STPAVARS" ] && grep -q "^SUSDA" "$STPAVARS" ; then writelog "INFO" "${FUNCNAME[0]} - Reading Steam Path variables from '$STPAVARS'" loadCfg "$STPAVARS" X @@ -18254,6 +18260,11 @@ function checkIntDeps { if [ -z "$YAD" ]; then YAD="$(command -v "yad")" fi + + if [ "$YAD" ]; then + writelog "ERROR" "${FUNCNAME[0]} - Could not find yad" "E" + exit 0 + fi if [ -n "$YAD" ] && [ ! -f "$YAD" ]; then OYAD="$YAD" From 23eadb563a211814d6bdbe82a2ff6f9b3072c62d Mon Sep 17 00:00:00 2001 From: Daniele Scasciafratte Date: Fri, 15 Mar 2024 14:41:37 +0100 Subject: [PATCH 2/7] feat(detect): if steam and yad not found stop the program --- steamtinkerlaunch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/steamtinkerlaunch b/steamtinkerlaunch index 8d159f17..610cfb01 100755 --- a/steamtinkerlaunch +++ b/steamtinkerlaunch @@ -18261,7 +18261,7 @@ function checkIntDeps { YAD="$(command -v "yad")" fi - if [ "$YAD" ]; then + if [ ! "$YAD" ]; then writelog "ERROR" "${FUNCNAME[0]} - Could not find yad" "E" exit 0 fi From 8706c4eb07c90dda9c71ff477ab470cbcaca1a1a Mon Sep 17 00:00:00 2001 From: Daniele Scasciafratte Date: Mon, 18 Mar 2024 18:22:41 +0100 Subject: [PATCH 3/7] feat(review): changes --- steamtinkerlaunch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/steamtinkerlaunch b/steamtinkerlaunch index 610cfb01..3eff25c7 100755 --- a/steamtinkerlaunch +++ b/steamtinkerlaunch @@ -619,8 +619,8 @@ function setSteamPath { } function setSteamPaths { - if [ ! -x "$(command -v "steam")" ]; then - echo "ERROR" "${FUNCNAME[0]} - Steam not found" + if [ ! -x "$(command -v "steam")" ] && [ "$INFLATPAK" -eq 0 ]; then + echo "ERROR" "Steam not found" writelog "ERROR" "${FUNCNAME[0]} - Steam not found" exit 0 fi @@ -18262,7 +18262,7 @@ function checkIntDeps { fi if [ ! "$YAD" ]; then - writelog "ERROR" "${FUNCNAME[0]} - Could not find yad" "E" + writelog "ERROR" "${FUNCNAME[0]} - Could not find yad" exit 0 fi From 057a9a0d9ae2a69286accb1c313b151c1a167647 Mon Sep 17 00:00:00 2001 From: Daniele Scasciafratte Date: Tue, 19 Mar 2024 10:32:17 +0100 Subject: [PATCH 4/7] feat(detect): if steam and yad not found stop the program --- steamtinkerlaunch | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/steamtinkerlaunch b/steamtinkerlaunch index 3eff25c7..76dcc6c7 100755 --- a/steamtinkerlaunch +++ b/steamtinkerlaunch @@ -7,7 +7,7 @@ PREFIX="/usr" PROGNAME="SteamTinkerLaunch" NICEPROGNAME="Steam Tinker Launch" -PROGVERS="v14.0.20240319-1" +PROGVERS="v14.0.20240307-3-(steam-check)" PROGCMD="${0##*/}" PROGINTERNALPROTNAME="Proton-stl" SHOSTL="stl" @@ -618,13 +618,7 @@ function setSteamPath { fi } -function setSteamPaths { - if [ ! -x "$(command -v "steam")" ] && [ "$INFLATPAK" -eq 0 ]; then - echo "ERROR" "Steam not found" - writelog "ERROR" "${FUNCNAME[0]} - Steam not found" - exit 0 - fi - +function setSteamPaths { if [ -f "$STPAVARS" ] && grep -q "^SUSDA" "$STPAVARS" ; then writelog "INFO" "${FUNCNAME[0]} - Reading Steam Path variables from '$STPAVARS'" loadCfg "$STPAVARS" X @@ -18260,11 +18254,6 @@ function checkIntDeps { if [ -z "$YAD" ]; then YAD="$(command -v "yad")" fi - - if [ ! "$YAD" ]; then - writelog "ERROR" "${FUNCNAME[0]} - Could not find yad" - exit 0 - fi if [ -n "$YAD" ] && [ ! -f "$YAD" ]; then OYAD="$YAD" @@ -18282,9 +18271,16 @@ function checkIntDeps { if [ ! -x "$(command -v "$YAD")" ]; then DEPSMISSING=1 - writelog "ERROR" "${FUNCNAME[0]} - '$YAD' was not found! Check '${PROGCMD} --help' for alternatives and/or read '$PROJECTPAGE/wiki/Yad'" "E" + writelog "ERROR" "${FUNCNAME[0]} - Yad dependency ('$YAD') was not found! Check '${PROGCMD} --help' for alternatives and/or read '$PROJECTPAGE/wiki/Yad'" "E" notiShow "$(strFix "$NOTY_NOTFOUND" "$YAD")" fi + + + if [ ! -x "$(command -v "steam")" ] && [ "$INFLATPAK" -eq 0 ]; then + DEPSMISSING=1 + echo "ERROR" "Steam not found" + writelog "ERROR" "${FUNCNAME[0]} - Steam not found" + fi setAwkBin @@ -24518,7 +24514,7 @@ function addNonSteamGame { } function setCloseVars { -# yes, ugly... ¯\_(ツ)_/¯ +# yes, ugly... ¯\_(ツ)_/¯ if [ ! -f "$CLOSEVARS" ]; then writelog "INFO" "${FUNCNAME[0]} - Storing all variables used in closeSTL into '$CLOSEVARS'" { From 4f926849e4ffbec19584350d8d5a64f5ab365391 Mon Sep 17 00:00:00 2001 From: Daniele Scasciafratte Date: Tue, 19 Mar 2024 10:33:11 +0100 Subject: [PATCH 5/7] Update steamtinkerlaunch --- steamtinkerlaunch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/steamtinkerlaunch b/steamtinkerlaunch index 76dcc6c7..0d56b32f 100755 --- a/steamtinkerlaunch +++ b/steamtinkerlaunch @@ -24514,7 +24514,7 @@ function addNonSteamGame { } function setCloseVars { -# yes, ugly... ¯\_(ツ)_/¯ +# yes, ugly... ¯¯\_(ツ)_/¯¯ if [ ! -f "$CLOSEVARS" ]; then writelog "INFO" "${FUNCNAME[0]} - Storing all variables used in closeSTL into '$CLOSEVARS'" { From 1e4b767dd4f0176c307190bcdcf6702993acbd47 Mon Sep 17 00:00:00 2001 From: Daniele Scasciafratte Date: Tue, 19 Mar 2024 10:33:53 +0100 Subject: [PATCH 6/7] Update steamtinkerlaunch --- steamtinkerlaunch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/steamtinkerlaunch b/steamtinkerlaunch index 0d56b32f..811e7448 100755 --- a/steamtinkerlaunch +++ b/steamtinkerlaunch @@ -618,7 +618,7 @@ function setSteamPath { fi } -function setSteamPaths { +function setSteamPaths { if [ -f "$STPAVARS" ] && grep -q "^SUSDA" "$STPAVARS" ; then writelog "INFO" "${FUNCNAME[0]} - Reading Steam Path variables from '$STPAVARS'" loadCfg "$STPAVARS" X @@ -24514,7 +24514,7 @@ function addNonSteamGame { } function setCloseVars { -# yes, ugly... ¯¯\_(ツ)_/¯¯ +# yes, ugly... ¯\_(ツ)_/¯ if [ ! -f "$CLOSEVARS" ]; then writelog "INFO" "${FUNCNAME[0]} - Storing all variables used in closeSTL into '$CLOSEVARS'" { From ab850b19a2c147cc7304231c09e3069f1fdb749b Mon Sep 17 00:00:00 2001 From: Eamonn Rea Date: Tue, 19 Mar 2024 17:23:22 +0000 Subject: [PATCH 7/7] version bump --- steamtinkerlaunch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/steamtinkerlaunch b/steamtinkerlaunch index 811e7448..19142e96 100755 --- a/steamtinkerlaunch +++ b/steamtinkerlaunch @@ -7,7 +7,7 @@ PREFIX="/usr" PROGNAME="SteamTinkerLaunch" NICEPROGNAME="Steam Tinker Launch" -PROGVERS="v14.0.20240307-3-(steam-check)" +PROGVERS="v14.0.20240320-1" PROGCMD="${0##*/}" PROGINTERNALPROTNAME="Proton-stl" SHOSTL="stl"