From 9bf071b03cf75ea7f81d8e39fbd333e3a360e1e6 Mon Sep 17 00:00:00 2001 From: Gerard Ninnes Date: Tue, 11 Jun 2024 23:18:12 +1000 Subject: [PATCH 1/3] Fixed the wine version comparison. Versions aren't decimal numbers. --- files/builds/stable-branch/bin/install.sh | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/files/builds/stable-branch/bin/install.sh b/files/builds/stable-branch/bin/install.sh index ee3d8d8..16c105e 100644 --- a/files/builds/stable-branch/bin/install.sh +++ b/files/builds/stable-branch/bin/install.sh @@ -169,12 +169,22 @@ fi function SP_CHECK_WINE_VERSION { #Wine version checking, warn user if their wine install is out of date WINE_VERSION="$(wine --version | cut -d ' ' -f1 | sed -e 's/wine-//' -e 's/-rc.*//')" + WINE_VERSION_SERIES="$(echo $WINE_VERSION | cut -d '.' -f1)" + WINE_VERSION_SERIES_RELEASE="$(echo $WINE_VERSION | cut -d '.' -f2)" + WINE_VERSION_MINIMUM=9.8 - if (( $(echo "$WINE_VERSION < $WINE_VERSION_MINIMUM" | bc -l) )); then + WINE_VERSION_SERIES_MINIMUM=9 + WINE_VERSION_SERIES_RELEASE_MINIMUM=8 + + if [ $WINE_VERSION_SERIES -lt $WINE_VERSION_SERIES_MINIMUM ]; then + # Wine was below the needed series - no need to check anything else. echo "Your version of wine ${WINE_VERSION} is too old and will not work with Autodesk Fusion. You should upgrade to at least ${WINE_VERSION_MINIMUM}" - SP_OS_SETTINGS + elif [ $WINE_VERSION_SERIES -eq $WINE_VERSION_SERIES_MINIMUM ] && [ $WINE_VERSION_SERIES_RELEASE -lt $WINE_VERSION_SERIES_RELEASE_MINIMUM ]; then + # Wine is the same series as the minimum + echo "Your version of wine ${WINE_VERSION} is too old and will not work with Autodesk Fusion. You should upgrade to at least ${WINE_VERSION_MINIMUM}" + else - SP_FUSION360_INSTALL + echo "Everything is awesome!" fi } From dfedfdb108be3249170eeabdf38472edccf4da87 Mon Sep 17 00:00:00 2001 From: Gerard Ninnes Date: Tue, 11 Jun 2024 23:26:12 +1000 Subject: [PATCH 2/3] Added back in the functions after I finished testing. --- files/builds/stable-branch/bin/install.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/files/builds/stable-branch/bin/install.sh b/files/builds/stable-branch/bin/install.sh index 16c105e..75242d1 100644 --- a/files/builds/stable-branch/bin/install.sh +++ b/files/builds/stable-branch/bin/install.sh @@ -179,12 +179,13 @@ function SP_CHECK_WINE_VERSION { if [ $WINE_VERSION_SERIES -lt $WINE_VERSION_SERIES_MINIMUM ]; then # Wine was below the needed series - no need to check anything else. echo "Your version of wine ${WINE_VERSION} is too old and will not work with Autodesk Fusion. You should upgrade to at least ${WINE_VERSION_MINIMUM}" + SP_OS_SETTINGS elif [ $WINE_VERSION_SERIES -eq $WINE_VERSION_SERIES_MINIMUM ] && [ $WINE_VERSION_SERIES_RELEASE -lt $WINE_VERSION_SERIES_RELEASE_MINIMUM ]; then - # Wine is the same series as the minimum + # Wine is the same series as the minimum requirement, but the dot release was below the minimum. echo "Your version of wine ${WINE_VERSION} is too old and will not work with Autodesk Fusion. You should upgrade to at least ${WINE_VERSION_MINIMUM}" - + SP_OS_SETTINGS else - echo "Everything is awesome!" + SP_FUSION360_INSTALL fi } From d4e555991c417f2ca24a1a86ef0cf89f8b83e378 Mon Sep 17 00:00:00 2001 From: Gerard Ninnes Date: Tue, 11 Jun 2024 23:30:29 +1000 Subject: [PATCH 3/3] Updated version of the script. --- files/builds/stable-branch/bin/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/builds/stable-branch/bin/install.sh b/files/builds/stable-branch/bin/install.sh index 75242d1..f3b1b34 100644 --- a/files/builds/stable-branch/bin/install.sh +++ b/files/builds/stable-branch/bin/install.sh @@ -7,8 +7,8 @@ # Author URI: https://cryinkfly.com # # License: MIT # # Copyright (c) 2020-2024 # -# Time/Date: 01:30/02.06.2024 # -# Version: 1.9.9 # +# Time/Date: 11:29/11.06.2024 # +# Version: 1.9.10 # #################################################################################################### # Path: /$HOME/.fusion360/bin/install.sh