diff --git a/files/builds/dev-branch/flatpak-installation.sh b/files/builds/dev-branch/flatpak-installation.sh index 30b7325..95e2fe8 100644 --- a/files/builds/dev-branch/flatpak-installation.sh +++ b/files/builds/dev-branch/flatpak-installation.sh @@ -118,6 +118,23 @@ mkdir -p "$HOME/.var/app/org.winehq.Wine/data/wineprefixes/fusion360/drive_c/use ############################################################################################################################################################### +# Download the Autodesk Fusion Installer +curl -L "$AUTODESK_FUSION_INSTALLER_URL" -o "$HOME/.var/app/org.winehq.Wine/data/wineprefixes/fusion360/drive_c/users/$USER/Downloads/Fusion360ClientInstaller.exe" + +# --- First run of the installer: allow up to 10 minutes --- +timeout 600 flatpak run --env="WINEPREFIX=$HOME/.var/app/org.winehq.Wine/data/wineprefixes/fusion360" org.winehq.Wine $HOME/.var/app/org.winehq.Wine/data/wineprefixes/fusion360/drive_c/users/$USER/Downloads/Fusion360ClientInstaller.exe --quiet || echo "First run timed out." + +# Kill Wine to ensure clean state +flatpak kill org.winehq.Wine + +# --- Second run of the installer: allow up to 1 minute --- +timeout 60 flatpak run --env="WINEPREFIX=$HOME/.var/app/org.winehq.Wine/data/wineprefixes/fusion360" org.winehq.Wine $HOME/.var/app/org.winehq.Wine/data/wineprefixes/fusion360/drive_c/users/$USER/Downloads/Fusion360ClientInstaller.exe --quiet || echo "Second run timed out." + +# Kill Wine to ensure clean state +flatpak kill org.winehq.Wine + +############################################################################################################################################################### + # Create mimetype link to handle web login call backs to the Identity Manager cat > $HOME/.local/share/applications/adskidmgr-opener.desktop << EOL [Desktop Entry] @@ -136,23 +153,6 @@ xdg-mime default adskidmgr-opener.desktop x-scheme-handler/adskidmgr ############################################################################################################################################################### -# Download the Autodesk Fusion Installer -curl -L "$AUTODESK_FUSION_INSTALLER_URL" -o "$HOME/.var/app/org.winehq.Wine/data/wineprefixes/fusion360/drive_c/users/$USER/Downloads/Fusion360ClientInstaller.exe" - -# --- First run of the installer: allow up to 10 minutes --- -timeout 600 flatpak run --env="WINEPREFIX=$HOME/.var/app/org.winehq.Wine/data/wineprefixes/fusion360" org.winehq.Wine $HOME/.var/app/org.winehq.Wine/data/wineprefixes/fusion360/drive_c/users/$USER/Downloads/Fusion360ClientInstaller.exe --quiet || echo "First run timed out." - -# Kill Wine to ensure clean state -flatpak kill org.winehq.Wine - -# --- Second run of the installer: allow up to 1 minute --- -timeout 60 flatpak run --env="WINEPREFIX=$HOME/.var/app/org.winehq.Wine/data/wineprefixes/fusion360" org.winehq.Wine $HOME/.var/app/org.winehq.Wine/data/wineprefixes/fusion360/drive_c/users/$USER/Downloads/Fusion360ClientInstaller.exe --quiet || echo "Second run timed out." - -# Kill Wine to ensure clean state -flatpak kill org.winehq.Wine - -############################################################################################################################################################### - # Find the Qt6WebEngineCore.dll file in the Autodesk Fusion directory QT6_WEBENGINECORE=$(find "$HOME/.var/app/org.winehq.Wine/data/wineprefixes/fusion360" -name 'Qt6WebEngineCore.dll' -printf "%T+ %p\n" | sort -r | head -n 1 | sed -r 's/^[^ ]+ //') QT6_WEBENGINECORE_DIR=$(dirname "$QT6_WEBENGINECORE")