From 37fbc30be908bf2faf3ba94d850c7aafe9a14ba7 Mon Sep 17 00:00:00 2001 From: Nick Douma Date: Sat, 6 May 2023 13:51:22 +0200 Subject: [PATCH 1/6] Make sure DEBIAN_BASED_2 gets called properly --- files/builds/stable-branch/bin/install.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/files/builds/stable-branch/bin/install.sh b/files/builds/stable-branch/bin/install.sh index 53f416c..c80c458 100644 --- a/files/builds/stable-branch/bin/install.sh +++ b/files/builds/stable-branch/bin/install.sh @@ -986,12 +986,12 @@ elif [[ $SP_OS = "Debian 10" ]]; then echo "Debian 10" DEBIAN_BASED_1 OS_DEBIAN_10 - DEBIAN_BASED_1 + DEBIAN_BASED_2 elif [[ $SP_OS = "Debian 11" ]]; then echo "Debian 11" DEBIAN_BASED_1 OS_DEBIAN_11 - DEBIAN_BASED_1 + DEBIAN_BASED_2 elif [[ $SP_OS = "EndeavourOS" ]]; then echo "EndeavourOS" OS_ARCHLINUX @@ -1014,17 +1014,17 @@ elif [[ $SP_OS = "Linux Mint 20.x" ]]; then echo "Linux Mint 20.x" DEBIAN_BASED_1 OS_UBUNTU_20 - DEBIAN_BASED_1 + DEBIAN_BASED_2 elif [[ $SP_OS = "Linux Mint 21.x" ]]; then echo "Linux Mint 21.x" DEBIAN_BASED_1 OS_UBUNTU_22 - DEBIAN_BASED_1 + DEBIAN_BASED_2 elif [[ $SP_OS = "Linux Mint 22.x" ]]; then echo "Linux Mint 22.x" DEBIAN_BASED_1 OS_UBUNTU_23 - DEBIAN_BASED_1 + DEBIAN_BASED_2 elif [[ $SP_OS = "Manjaro Linux" ]]; then echo "Manjaro Linux" OS_ARCHLINUX From fa6214167f4e79059a27aa0ce4f6c4ddd01896e6 Mon Sep 17 00:00:00 2001 From: Nick Douma Date: Sat, 6 May 2023 13:53:37 +0200 Subject: [PATCH 2/6] Do not download locale files twice --- files/builds/stable-branch/locale/locale.sh | 36 --------------------- 1 file changed, 36 deletions(-) diff --git a/files/builds/stable-branch/locale/locale.sh b/files/builds/stable-branch/locale/locale.sh index a268d9f..30cd8c9 100644 --- a/files/builds/stable-branch/locale/locale.sh +++ b/files/builds/stable-branch/locale/locale.sh @@ -35,24 +35,6 @@ function load-locale-languages { chmod +x $SP_PATH/locale/ko-KR/locale-ko.sh wget -N -P $SP_PATH/locale/zh-CN/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/zh-CN/locale-zh.sh chmod +x $SP_PATH/locale/zh-CN/locale-zh.sh - wget -N -P $SP_PATH/locale/cs-CZ/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/cs-CZ/locale-cs.sh - chmod +x $SP_PATH/locale/cs-CZ/locale-cs.sh - wget -N -P $SP_PATH/locale/de-DE/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/de-DE/locale-de.sh - chmod +x $SP_PATH/locale/de-DE/locale-de.sh - wget -N -P $SP_PATH/locale/en-US/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/en-US/locale-en.sh - chmod +x $SP_PATH/locale/en-US/locale-en.sh - wget -N -P $SP_PATH/locale/es-ES/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/es-ES/locale-es.sh - chmod +x $SP_PATH/locale/es-ES/locale-es.sh - wget -N -P $SP_PATH/locale/fr-FR/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/fr-FR/locale-fr.sh - chmod +x $SP_PATH/locale/fr-FR/locale-fr.sh - wget -N -P $SP_PATH/locale/it-IT/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/it-IT/locale-it.sh - chmod +x $SP_PATH/locale/it-IT/locale-it.sh - wget -N -P $SP_PATH/locale/ja-JP/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/ja-JP/locale-ja.sh - chmod +x $SP_PATH/locale/ja-JP/locale-ja.sh - wget -N -P $SP_PATH/locale/ko-KR/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/ko-KR/locale-ko.sh - chmod +x $SP_PATH/locale/ko-KR/locale-ko.sh - wget -N -P $SP_PATH/locale/zh-CN/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/zh-CN/locale-zh.sh - chmod +x $SP_PATH/locale/zh-CN/locale-zh.sh } ############################################################################################################################################################### @@ -68,15 +50,6 @@ function load-locale-licenses { wget -N -P $SP_PATH/locale/ja-JP/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/ja-JP/license-ja.txt wget -N -P $SP_PATH/locale/ko-KR/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/ko-KR/license-ko.txt wget -N -P $SP_PATH/locale/zh-CN/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/zh-CN/license-zh.txt - wget -N -P $SP_PATH/locale/cs-CZ/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/cs-CZ/license-cs.txt - wget -N -P $SP_PATH/locale/de-DE/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/de-DE/license-de.txt - wget -N -P $SP_PATH/locale/en-US/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/en-US/license-en.txt - wget -N -P $SP_PATH/locale/es-ES/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/es-ES/license-es.txt - wget -N -P $SP_PATH/locale/fr-FR/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/fr-FR/license-fr.txt - wget -N -P $SP_PATH/locale/it-IT/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/it-IT/license-it.txt - wget -N -P $SP_PATH/locale/ja-JP/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/ja-JP/license-ja.txt - wget -N -P $SP_PATH/locale/ko-KR/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/ko-KR/license-ko.txt - wget -N -P $SP_PATH/locale/zh-CN/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/zh-CN/license-zh.txt } ############################################################################################################################################################### @@ -92,15 +65,6 @@ function load-locale-extensions { wget -N -P $SP_PATH/locale/ja-JP/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/ja-JP/extensions-ja.txt wget -N -P $SP_PATH/locale/ko-KR/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/ko-KR/extensions-ko.txt wget -N -P $SP_PATH/locale/zh-CN/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/zh-CN/extensions-zh.txt - wget -N -P $SP_PATH/locale/cs-CZ/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/cs-CZ/extensions-cs.txt - wget -N -P $SP_PATH/locale/de-DE/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/de-DE/extensions-de.txt - wget -N -P $SP_PATH/locale/en-US/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/en-US/extensions-en.txt - wget -N -P $SP_PATH/locale/es-ES/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/es-ES/extensions-es.txt - wget -N -P $SP_PATH/locale/fr-FR/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/fr-FR/extensions-fr.txt - wget -N -P $SP_PATH/locale/it-IT/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/it-IT/extensions-it.txt - wget -N -P $SP_PATH/locale/ja-JP/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/ja-JP/extensions-ja.txt - wget -N -P $SP_PATH/locale/ko-KR/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/ko-KR/extensions-ko.txt - wget -N -P $SP_PATH/locale/zh-CN/ https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/builds/stable-branch/locale/zh-CN/extensions-zh.txt } ############################################################################################################################################################### From 438abe8ff98d918960a8dbf2ae314fc2c30b0aca Mon Sep 17 00:00:00 2001 From: Nick Douma Date: Sat, 6 May 2023 14:37:51 +0200 Subject: [PATCH 3/6] Add -y to apt-get to actually install packages --- 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 c80c458..e6a1534 100644 --- a/files/builds/stable-branch/bin/install.sh +++ b/files/builds/stable-branch/bin/install.sh @@ -519,8 +519,8 @@ function DEBIAN_BASED_1 { function DEBIAN_BASED_2 { sudo apt-get update - sudo apt-get install p7zip p7zip-full p7zip-rar curl winbind cabextract wget - sudo apt-get install --install-recommends winehq-staging + sudo apt-get install -y p7zip p7zip-full p7zip-rar curl winbind cabextract wget + sudo apt-get install -y --install-recommends winehq-staging SP_FUSION360_INSTALL } From 286bcd169253c1133dbc763a7fe30a499a0cf6c9 Mon Sep 17 00:00:00 2001 From: alextrical <35117191+alextrical@users.noreply.github.com> Date: Wed, 31 May 2023 15:36:43 +0100 Subject: [PATCH 4/6] SSO login fix post April update Set environment variable in Launcher to allow legacy login on up to date Fusion360 Set download back to fetching the latest release Changed icon to align with theme change in the last 12 months --- files/builds/stable-branch/bin/Fusion360.ico | Bin 0 -> 178976 bytes files/builds/stable-branch/bin/install.sh | 10 +++++----- files/builds/stable-branch/bin/launcher.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 files/builds/stable-branch/bin/Fusion360.ico diff --git a/files/builds/stable-branch/bin/Fusion360.ico b/files/builds/stable-branch/bin/Fusion360.ico new file mode 100644 index 0000000000000000000000000000000000000000..1c500fe059d992e3021e49c5759c76fa9a2ef924 GIT binary patch literal 178976 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 literal 0 HcmV?d00001 diff --git a/files/builds/stable-branch/bin/install.sh b/files/builds/stable-branch/bin/install.sh index e6a1534..f443f89 100644 --- a/files/builds/stable-branch/bin/install.sh +++ b/files/builds/stable-branch/bin/install.sh @@ -281,7 +281,7 @@ function SP_FUSION360_INSTALLER_LOAD { echo "The Autodesk Fusion 360 installer exist!" else echo "The Autodesk Fusion 360 installer doesn't exist and will be downloaded for you!" - wget -T 15 -t 0 -N -c 'https://web.archive.org/web/20230317210714id_/https://dl.appstreaming.autodesk.com/production/installers/Fusion 360 Admin Install.exe' -O Fusion360installer.exe + wget https://dl.appstreaming.autodesk.com/production/installers/Fusion%20360%20Admin%20Install.exe -O Fusion360installer.exe mv "Fusion360installer.exe" "$SP_PATH/downloads/Fusion360installer.exe" fi } @@ -293,7 +293,7 @@ function SP_FUSION360_INSTALLER_LOAD { # Load the icons and .desktop-files: function SP_FUSION360_SHORTCUTS_LOAD { # Create a .desktop file (launcher.sh) for Autodesk Fusion 360! - wget -N -P "$SP_PATH/graphics" https://raw.githubusercontent.com/cryinkfly/Autodesk-Fusion-360-for-Linux/main/files/builds/stable-branch/bin/fusion360.svg + wget -N -P "$SP_PATH/graphics" https://raw.githubusercontent.com/cryinkfly/Autodesk-Fusion-360-for-Linux/main/files/builds/stable-branch/bin/Fusion360.ico rm "$HOME/.local/share/applications/wine/Programs/Autodesk/Autodesk Fusion 360.desktop" mkdir -p "$HOME/.local/share/applications/wine/Programs/Autodesk/Fusion360/$WP_TYPE" cat >> "$HOME/.local/share/applications/wine/Programs/Autodesk/Fusion360/$WP_TYPE/fusion360.desktop" << EOF @@ -321,13 +321,13 @@ Exec=$WP_DIRECTORY/box-run.sh Type=Application Categories=Education;Engineering; StartupNotify=true -Icon=$SP_PATH/graphics/fusion360.svg +Icon=$SP_PATH/graphics/Fusion360.ico Terminal=false Path=$WP_DIRECTORY EOF # Create a .desktop file (uninstall.sh) for Autodesk Fusion 360! - wget -N -P "$SP_PATH/graphics" https://raw.githubusercontent.com/cryinkfly/Autodesk-Fusion-360-for-Linux/main/files/builds/stable-branch/bin/fusion360-uninstall.svg + wget -N -P "$SP_PATH/graphics" https://raw.githubusercontent.com/cryinkfly/Autodesk-Fusion-360-for-Linux/main/files/builds/stable-branch/bin/Fusion360.ico cat >> "$HOME/.local/share/applications/wine/Programs/Autodesk/Fusion360/$WP_TYPE/fusion360uninstall.desktop" << EOF [Desktop Entry] Name=Autodesk Fusion 360 (Uninstall) - $WP_TYPE @@ -352,7 +352,7 @@ Exec=bash ./uninstall.sh Type=Application Categories=Education;Engineering; StartupNotify=true -Icon=$SP_PATH/graphics/fusion360-uninstall.svg +Icon=$SP_PATH/graphics/Fusion360.ico Terminal=false Path=$SP_PATH/bin EOF diff --git a/files/builds/stable-branch/bin/launcher.sh b/files/builds/stable-branch/bin/launcher.sh index ecad710..55e9f58 100644 --- a/files/builds/stable-branch/bin/launcher.sh +++ b/files/builds/stable-branch/bin/launcher.sh @@ -58,7 +58,7 @@ function LAUNCHER_CHECK_UPDATE_VERSION { # You must change the first part ($HOME/.wineprefixes/fusion360) and the last part (WINEPREFIX="$HOME/.wineprefixes/fusion360") when you have installed Autodesk Fusion 360 into another directory! function LAUNCHER_RUN_FUSION360 { - LAUNCHER="$(find "$WP_BOX" -name Fusion360.exe -printf "%T+ %p\n" | sort -r 2>&1 | head -n 1 | sed -r 's/.+0000000000 (.+)/\1/')" && WINEPREFIX="$WP_BOX" wine "$LAUNCHER" + WINEPREFIX="$WP_BOX" FUSION_IDSDK=false WINEDEBUG=-all wine "C:\users\Public\Desktop\Autodesk Fusion 360.lnk" } ############################################################################################################################################################### From 6b85bd7cfa48107358e68d2e413e2b468d2e14d0 Mon Sep 17 00:00:00 2001 From: Steve Zabka <79079633+cryinkfly@users.noreply.github.com> Date: Wed, 31 May 2023 17:25:43 +0200 Subject: [PATCH 5/6] Update install.sh Solved Bug #319 --- files/builds/stable-branch/bin/install.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/files/builds/stable-branch/bin/install.sh b/files/builds/stable-branch/bin/install.sh index f443f89..6434e4f 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-2023 # -# Time/Date: 07:40/05.05.2023 # -# Version: 1.8.8 # +# Time/Date: 17:20/31.05.2023 # +# Version: 1.8.9 # #################################################################################################### # Path: /$HOME/.fusion360/bin/install.sh @@ -293,7 +293,7 @@ function SP_FUSION360_INSTALLER_LOAD { # Load the icons and .desktop-files: function SP_FUSION360_SHORTCUTS_LOAD { # Create a .desktop file (launcher.sh) for Autodesk Fusion 360! - wget -N -P "$SP_PATH/graphics" https://raw.githubusercontent.com/cryinkfly/Autodesk-Fusion-360-for-Linux/main/files/builds/stable-branch/bin/Fusion360.ico + wget -N -P "$SP_PATH/graphics" https://raw.githubusercontent.com/cryinkfly/Autodesk-Fusion-360-for-Linux/main/files/builds/stable-branch/bin/fusion360.svg rm "$HOME/.local/share/applications/wine/Programs/Autodesk/Autodesk Fusion 360.desktop" mkdir -p "$HOME/.local/share/applications/wine/Programs/Autodesk/Fusion360/$WP_TYPE" cat >> "$HOME/.local/share/applications/wine/Programs/Autodesk/Fusion360/$WP_TYPE/fusion360.desktop" << EOF @@ -321,13 +321,13 @@ Exec=$WP_DIRECTORY/box-run.sh Type=Application Categories=Education;Engineering; StartupNotify=true -Icon=$SP_PATH/graphics/Fusion360.ico +Icon=$SP_PATH/graphics/fusion360.svg Terminal=false Path=$WP_DIRECTORY EOF # Create a .desktop file (uninstall.sh) for Autodesk Fusion 360! - wget -N -P "$SP_PATH/graphics" https://raw.githubusercontent.com/cryinkfly/Autodesk-Fusion-360-for-Linux/main/files/builds/stable-branch/bin/Fusion360.ico + wget -N -P "$SP_PATH/graphics" https://raw.githubusercontent.com/cryinkfly/Autodesk-Fusion-360-for-Linux/main/files/builds/stable-branch/bin/fusion360.svg cat >> "$HOME/.local/share/applications/wine/Programs/Autodesk/Fusion360/$WP_TYPE/fusion360uninstall.desktop" << EOF [Desktop Entry] Name=Autodesk Fusion 360 (Uninstall) - $WP_TYPE @@ -352,7 +352,7 @@ Exec=bash ./uninstall.sh Type=Application Categories=Education;Engineering; StartupNotify=true -Icon=$SP_PATH/graphics/Fusion360.ico +Icon=$SP_PATH/graphics/fusion360.svg Terminal=false Path=$SP_PATH/bin EOF From c20fe0874810d52515429fbec8f081f165312ce9 Mon Sep 17 00:00:00 2001 From: Steve Zabka <79079633+cryinkfly@users.noreply.github.com> Date: Wed, 31 May 2023 17:28:12 +0200 Subject: [PATCH 6/6] Update launcher.sh Solved the bug #319 --- files/builds/stable-branch/bin/launcher.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/builds/stable-branch/bin/launcher.sh b/files/builds/stable-branch/bin/launcher.sh index 55e9f58..21e1a83 100644 --- a/files/builds/stable-branch/bin/launcher.sh +++ b/files/builds/stable-branch/bin/launcher.sh @@ -58,7 +58,7 @@ function LAUNCHER_CHECK_UPDATE_VERSION { # You must change the first part ($HOME/.wineprefixes/fusion360) and the last part (WINEPREFIX="$HOME/.wineprefixes/fusion360") when you have installed Autodesk Fusion 360 into another directory! function LAUNCHER_RUN_FUSION360 { - WINEPREFIX="$WP_BOX" FUSION_IDSDK=false WINEDEBUG=-all wine "C:\users\Public\Desktop\Autodesk Fusion 360.lnk" + LAUNCHER="$(find "$WP_BOX" -name Fusion360.exe -printf "%T+ %p\n" | sort -r 2>&1 | head -n 1 | sed -r 's/.+0000000000 (.+)/\1/')" && WINEPREFIX="$WP_BOX" FUSION_IDSDK=false WINEDEBUG=-all wine "$LAUNCHER" } ###############################################################################################################################################################