From ba5ee9d866272b22d4b7706d65aae9415926b51d Mon Sep 17 00:00:00 2001 From: alextrical <35117191+alextrical@users.noreply.github.com> Date: Mon, 24 Apr 2023 16:29:31 +0100 Subject: [PATCH 1/2] Used link for Version locked Admin installer As the issue with logging in is caused due to an update in Fusion 360 to use Single Sign On, This version locked download allows install and login still within Wine --- files/builds/stable-branch/bin/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/builds/stable-branch/bin/install.sh b/files/builds/stable-branch/bin/install.sh index 40e9745..a22f2c4 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 https://dl.appstreaming.autodesk.com/production/installers/Fusion%20360%20Admin%20Install.exe -O Fusion360installer.exe + 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 mv "Fusion360installer.exe" "$SP_PATH/downloads/Fusion360installer.exe" fi } From 080d69e004f6d706d217c4cdfb285249bb10f6db Mon Sep 17 00:00:00 2001 From: alextrical <35117191+alextrical@users.noreply.github.com> Date: Mon, 24 Apr 2023 16:48:55 +0100 Subject: [PATCH 2/2] Updated Locale's for Ubuntu 23.04 --- files/builds/stable-branch/bin/install.sh | 16 ++++++++++++++++ .../stable-branch/locale/cs-CZ/locale-cs.sh | 2 +- .../stable-branch/locale/de-DE/locale-de.sh | 2 +- .../stable-branch/locale/en-US/locale-en.sh | 2 +- .../stable-branch/locale/es-ES/locale-es.sh | 2 +- .../stable-branch/locale/fr-FR/locale-fr.sh | 2 +- .../stable-branch/locale/it-IT/locale-it.sh | 2 +- .../stable-branch/locale/ja-JP/locale-ja.sh | 2 +- .../stable-branch/locale/ko-KR/locale-ko.sh | 2 +- .../stable-branch/locale/zh-CN/locale-zh.sh | 2 +- 10 files changed, 25 insertions(+), 9 deletions(-) diff --git a/files/builds/stable-branch/bin/install.sh b/files/builds/stable-branch/bin/install.sh index a22f2c4..66e75b8 100644 --- a/files/builds/stable-branch/bin/install.sh +++ b/files/builds/stable-branch/bin/install.sh @@ -554,6 +554,12 @@ function OS_UBUNTU_22 { sudo apt-add-repository 'deb https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_22.04/ ./' } +function OS_UBUNTU_23 { + sudo add-apt-repository -r 'deb https://dl.winehq.org/wine-builds/ubuntu/ focal main' + wget -q https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_23.04/Release.key -O Release.key -O- | sudo apt-key add - + sudo apt-add-repository 'deb https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_23.04/ ./' +} + ############################################################################################################################################################### function FEDORA_BASED_1 { @@ -1014,6 +1020,11 @@ elif [[ $SP_OS = "Linux Mint 21.x" ]]; then DEBIAN_BASED_1 OS_UBUNTU_22 DEBIAN_BASED_1 +elif [[ $SP_OS = "Linux Mint 22.x" ]]; then + echo "Linux Mint 22.x" + DEBIAN_BASED_1 + OS_UBUNTU_23 + DEBIAN_BASED_1 elif [[ $SP_OS = "Manjaro Linux" ]]; then echo "Manjaro Linux" OS_ARCHLINUX @@ -1050,6 +1061,11 @@ elif [[ $SP_OS = "Ubuntu 22.04" ]]; then DEBIAN_BASED_1 OS_UBUNTU_22 DEBIAN_BASED_2 +elif [[ $SP_OS = "Ubuntu 23.04" ]]; then + echo "Ubuntu 23.04" + DEBIAN_BASED_1 + OS_UBUNTU_23 + DEBIAN_BASED_2 elif [[ $SP_OS = "Void Linux" ]]; then echo "Void Linux" OS_VOID_LINUX diff --git a/files/builds/stable-branch/locale/cs-CZ/locale-cs.sh b/files/builds/stable-branch/locale/cs-CZ/locale-cs.sh index 210377a..239b0fa 100644 --- a/files/builds/stable-branch/locale/cs-CZ/locale-cs.sh +++ b/files/builds/stable-branch/locale/cs-CZ/locale-cs.sh @@ -60,7 +60,7 @@ SP_LOGFILE_WINEPREFIX_INFO_TOOLTIP_3="Odstraňte aktuální Wineprefix ze svého SP_OS_TITLE="Linux distribuce - Konfigurace" SP_OS_LABEL_1="V tomto kroku nyní můžete vybrat svou distribuci Linuxu a nainstalovat potřebné balíčky pro instalaci." SP_OS_LABEL_2="Linux distribuce:" -SP_OS_SELECT=$(echo "Arch Linux,Debian 10,Debian 11,EndeavourOS,Fedora 35,Fedora 36,Linux Mint 19.x,Linux Mint 20.x,Manjaro Linux,openSUSE Leap 15.3,openSUSE Leap 15.4,openSUSE Tumbleweed,Red Hat Enterprise Linux 8.x,Red Hat Enterprise Linux 9.x,Solus,Ubuntu 18.04,Ubuntu 20.04,Ubuntu 22.04,Void Linux,Gentoo Linux") +SP_OS_SELECT=$(echo "Arch Linux,Debian 10,Debian 11,EndeavourOS,Fedora 35,Fedora 36,Linux Mint 19.x,Linux Mint 20.x,Manjaro Linux,openSUSE Leap 15.3,openSUSE Leap 15.4,openSUSE Tumbleweed,Red Hat Enterprise Linux 8.x,Red Hat Enterprise Linux 9.x,Solus,Ubuntu 18.04,Ubuntu 20.04,Ubuntu 22.04,Ubuntu 23.04,Void Linux,Gentoo Linux") ############################################################################################################################################################### diff --git a/files/builds/stable-branch/locale/de-DE/locale-de.sh b/files/builds/stable-branch/locale/de-DE/locale-de.sh index 9b69484..288d22c 100644 --- a/files/builds/stable-branch/locale/de-DE/locale-de.sh +++ b/files/builds/stable-branch/locale/de-DE/locale-de.sh @@ -60,7 +60,7 @@ SP_LOGFILE_WINEPREFIX_INFO_TOOLTIP_3="Entfernen Sie eine aktuelle Wineprefix von SP_OS_TITLE="Linux-Distribution - Konfiguration" SP_OS_LABEL_1="In diesem Schritt können Sie nun Ihre Linux-Distribution auswählen, um die benötigten Pakete für die Installation zu installieren." SP_OS_LABEL_2="Linux-Distribution:" -SP_OS_SELECT=$(echo "Arch Linux,Debian 10,Debian 11,EndeavourOS,Fedora 35,Fedora 36,Linux Mint 19.x,Linux Mint 20.x,Manjaro Linux,openSUSE Leap 15.3,openSUSE Leap 15.4,openSUSE Tumbleweed,Red Hat Enterprise Linux 8.x,Red Hat Enterprise Linux 9.x,Solus,Ubuntu 18.04,Ubuntu 20.04,Ubuntu 22.04,Void Linux,Gentoo Linux") +SP_OS_SELECT=$(echo "Arch Linux,Debian 10,Debian 11,EndeavourOS,Fedora 35,Fedora 36,Linux Mint 19.x,Linux Mint 20.x,Manjaro Linux,openSUSE Leap 15.3,openSUSE Leap 15.4,openSUSE Tumbleweed,Red Hat Enterprise Linux 8.x,Red Hat Enterprise Linux 9.x,Solus,Ubuntu 18.04,Ubuntu 20.04,Ubuntu 22.04,Ubuntu 23.04,Void Linux,Gentoo Linux") ############################################################################################################################################################### diff --git a/files/builds/stable-branch/locale/en-US/locale-en.sh b/files/builds/stable-branch/locale/en-US/locale-en.sh index 297c608..4277f8e 100644 --- a/files/builds/stable-branch/locale/en-US/locale-en.sh +++ b/files/builds/stable-branch/locale/en-US/locale-en.sh @@ -60,7 +60,7 @@ SP_LOGFILE_WINEPREFIX_INFO_TOOLTIP_3="Remove a current Wineprefix from your syst SP_OS_TITLE="Linux distribution - Configuration" SP_OS_LABEL_1="In this step you can now select your Linux distribution to install the required packages for the installation." SP_OS_LABEL_2="Linux distribution:" -SP_OS_SELECT=$(echo "Arch Linux,Debian 10,Debian 11,EndeavourOS,Fedora 35,Fedora 36,Linux Mint 19.x,Linux Mint 20.x,Manjaro Linux,openSUSE Leap 15.3,openSUSE Leap 15.4,openSUSE Tumbleweed,Red Hat Enterprise Linux 8.x,Red Hat Enterprise Linux 9.x,Solus,Ubuntu 18.04,Ubuntu 20.04,Ubuntu 22.04,Void Linux,Gentoo Linux") +SP_OS_SELECT=$(echo "Arch Linux,Debian 10,Debian 11,EndeavourOS,Fedora 35,Fedora 36,Linux Mint 19.x,Linux Mint 20.x,Manjaro Linux,openSUSE Leap 15.3,openSUSE Leap 15.4,openSUSE Tumbleweed,Red Hat Enterprise Linux 8.x,Red Hat Enterprise Linux 9.x,Solus,Ubuntu 18.04,Ubuntu 20.04,Ubuntu 22.04,Ubuntu 23.04,Void Linux,Gentoo Linux") ############################################################################################################################################################### diff --git a/files/builds/stable-branch/locale/es-ES/locale-es.sh b/files/builds/stable-branch/locale/es-ES/locale-es.sh index 4ab797f..a7e0a4c 100644 --- a/files/builds/stable-branch/locale/es-ES/locale-es.sh +++ b/files/builds/stable-branch/locale/es-ES/locale-es.sh @@ -60,7 +60,7 @@ SP_LOGFILE_WINEPREFIX_INFO_TOOLTIP_3="¡Elimine un Wineprefix actual de su siste SP_OS_TITLE="Distribución Linux - Configuración" SP_OS_LABEL_1="En este paso ahora puede seleccionar su distribución de Linux para instalar los paquetes necesarios para la instalación." SP_OS_LABEL_2="Distribución de Linux:" -SP_OS_SELECT=$(echo "Arch Linux,Debian 10,Debian 11,EndeavourOS,Fedora 35,Fedora 36,Linux Mint 19.x,Linux Mint 20.x,Manjaro Linux,openSUSE Leap 15.3,openSUSE Leap 15.4,openSUSE Tumbleweed,Red Hat Enterprise Linux 8.x,Red Hat Enterprise Linux 9.x,Solus,Ubuntu 18.04,Ubuntu 20.04,Ubuntu 22.04,Void Linux,Gentoo Linux") +SP_OS_SELECT=$(echo "Arch Linux,Debian 10,Debian 11,EndeavourOS,Fedora 35,Fedora 36,Linux Mint 19.x,Linux Mint 20.x,Manjaro Linux,openSUSE Leap 15.3,openSUSE Leap 15.4,openSUSE Tumbleweed,Red Hat Enterprise Linux 8.x,Red Hat Enterprise Linux 9.x,Solus,Ubuntu 18.04,Ubuntu 20.04,Ubuntu 22.04,Ubuntu 23.04,Void Linux,Gentoo Linux") ############################################################################################################################################################### diff --git a/files/builds/stable-branch/locale/fr-FR/locale-fr.sh b/files/builds/stable-branch/locale/fr-FR/locale-fr.sh index b8bbf5c..6d41ff5 100644 --- a/files/builds/stable-branch/locale/fr-FR/locale-fr.sh +++ b/files/builds/stable-branch/locale/fr-FR/locale-fr.sh @@ -60,7 +60,7 @@ SP_LOGFILE_WINEPREFIX_INFO_TOOLTIP_3="Supprimer un préfixe Wine actuel de votre SP_OS_TITLE="Distribution Linux - Configuration" SP_OS_LABEL_1="Dans cette étape, vous pouvez maintenant sélectionner votre distribution Linux pour installer les packages requis pour l'installation." SP_OS_LABEL_2="Répartition Linux :" -SP_OS_SELECT=$(echo "Arch Linux,Debian 10,Debian 11,EndeavourOS,Fedora 35,Fedora 36,Linux Mint 19.x,Linux Mint 20.x,Manjaro Linux,openSUSE Leap 15.3,openSUSE Leap 15.4,openSUSE Tumbleweed,Red Hat Enterprise Linux 8.x,Red Hat Enterprise Linux 9.x,Solus,Ubuntu 18.04,Ubuntu 20.04,Ubuntu 22.04,Void Linux,Gentoo Linux") +SP_OS_SELECT=$(echo "Arch Linux,Debian 10,Debian 11,EndeavourOS,Fedora 35,Fedora 36,Linux Mint 19.x,Linux Mint 20.x,Manjaro Linux,openSUSE Leap 15.3,openSUSE Leap 15.4,openSUSE Tumbleweed,Red Hat Enterprise Linux 8.x,Red Hat Enterprise Linux 9.x,Solus,Ubuntu 18.04,Ubuntu 20.04,Ubuntu 22.04,Ubuntu 23.04,Void Linux,Gentoo Linux") ############################################################################################################################################################### diff --git a/files/builds/stable-branch/locale/it-IT/locale-it.sh b/files/builds/stable-branch/locale/it-IT/locale-it.sh index 014691c..a5177c3 100644 --- a/files/builds/stable-branch/locale/it-IT/locale-it.sh +++ b/files/builds/stable-branch/locale/it-IT/locale-it.sh @@ -60,7 +60,7 @@ SP_LOGFILE_WINEPREFIX_INFO_TOOLTIP_3="Rimuovi un Wineprefix corrente dal tuo sis SP_OS_TITLE="Distribuzione Linux - Configurazione" SP_OS_LABEL_1="In questo passaggio puoi ora selezionare la tua distribuzione Linux per installare i pacchetti richiesti per l'installazione." SP_OS_LABEL_2="Distribuzione Linux:" -SP_OS_SELECT=$(echo "Arch Linux,Debian 10,Debian 11,EndeavourOS,Fedora 35,Fedora 36,Linux Mint 19.x,Linux Mint 20.x,Manjaro Linux,openSUSE Leap 15.3,openSUSE Leap 15.4,openSUSE Tumbleweed,Red Hat Enterprise Linux 8.x,Red Hat Enterprise Linux 9.x,Solus,Ubuntu 18.04,Ubuntu 20.04,Ubuntu 22.04,Void Linux,Gentoo Linux") +SP_OS_SELECT=$(echo "Arch Linux,Debian 10,Debian 11,EndeavourOS,Fedora 35,Fedora 36,Linux Mint 19.x,Linux Mint 20.x,Manjaro Linux,openSUSE Leap 15.3,openSUSE Leap 15.4,openSUSE Tumbleweed,Red Hat Enterprise Linux 8.x,Red Hat Enterprise Linux 9.x,Solus,Ubuntu 18.04,Ubuntu 20.04,Ubuntu 22.04,Ubuntu 23.04,Void Linux,Gentoo Linux") ############################################################################################################################################################### diff --git a/files/builds/stable-branch/locale/ja-JP/locale-ja.sh b/files/builds/stable-branch/locale/ja-JP/locale-ja.sh index a44ef2c..4d4a51f 100644 --- a/files/builds/stable-branch/locale/ja-JP/locale-ja.sh +++ b/files/builds/stable-branch/locale/ja-JP/locale-ja.sh @@ -60,7 +60,7 @@ SP_LOGFILE_WINEPREFIX_INFO_TOOLTIP_3="システムから現在のWineprefixを SP_OS_TITLE="Linuxディストリビューション-構成" SP_OS_LABEL_1="このステップでは、Linuxディストリビューションを選択して、インストールに必要なパッケージをインストールできます。" SP_OS_LABEL_2="Linuxディストリビューション：" -SP_OS_SELECT=$(echo "Arch Linux,Debian 10,Debian 11,EndeavourOS,Fedora 35,Fedora 36,Linux Mint 19.x,Linux Mint 20.x,Manjaro Linux,openSUSE Leap 15.3,openSUSE Leap 15.4,openSUSE Tumbleweed,Red Hat Enterprise Linux 8.x,Red Hat Enterprise Linux 9.x,Solus,Ubuntu 18.04,Ubuntu 20.04,Ubuntu 22.04,Void Linux,Gentoo Linux") +SP_OS_SELECT=$(echo "Arch Linux,Debian 10,Debian 11,EndeavourOS,Fedora 35,Fedora 36,Linux Mint 19.x,Linux Mint 20.x,Manjaro Linux,openSUSE Leap 15.3,openSUSE Leap 15.4,openSUSE Tumbleweed,Red Hat Enterprise Linux 8.x,Red Hat Enterprise Linux 9.x,Solus,Ubuntu 18.04,Ubuntu 20.04,Ubuntu 22.04,Ubuntu 23.04,Void Linux,Gentoo Linux") ############################################################################################################################################################### diff --git a/files/builds/stable-branch/locale/ko-KR/locale-ko.sh b/files/builds/stable-branch/locale/ko-KR/locale-ko.sh index a73bbd3..dbae601 100644 --- a/files/builds/stable-branch/locale/ko-KR/locale-ko.sh +++ b/files/builds/stable-branch/locale/ko-KR/locale-ko.sh @@ -60,7 +60,7 @@ SP_LOGFILE_WINEPREFIX_INFO_TOOLTIP_3="시스템에서 현재 Wineprefix를 제 SP_OS_TITLE="Linux 배포 - 구성" SP_OS_LABEL_1="이 단계에서는 이제 Linux 배포판을 선택하여 설치에 필요한 패키지를 설치할 수 있습니다." SP_OS_LABEL_2="Linux 배포판:" -SP_OS_SELECT=$(echo "Arch Linux,Debian 10,Debian 11,EndeavourOS,Fedora 35,Fedora 36,Linux Mint 19.x,Linux Mint 20.x,Manjaro Linux,openSUSE Leap 15.3,openSUSE Leap 15.4,openSUSE Tumbleweed,Red Hat Enterprise Linux 8.x,Red Hat Enterprise Linux 9.x,Solus,Ubuntu 18.04,Ubuntu 20.04,Ubuntu 22.04,Void Linux,Gentoo Linux") +SP_OS_SELECT=$(echo "Arch Linux,Debian 10,Debian 11,EndeavourOS,Fedora 35,Fedora 36,Linux Mint 19.x,Linux Mint 20.x,Manjaro Linux,openSUSE Leap 15.3,openSUSE Leap 15.4,openSUSE Tumbleweed,Red Hat Enterprise Linux 8.x,Red Hat Enterprise Linux 9.x,Solus,Ubuntu 18.04,Ubuntu 20.04,Ubuntu 22.04,Ubuntu 23.04,Void Linux,Gentoo Linux") ############################################################################################################################################################### diff --git a/files/builds/stable-branch/locale/zh-CN/locale-zh.sh b/files/builds/stable-branch/locale/zh-CN/locale-zh.sh index 3ad11b8..d2f83ed 100644 --- a/files/builds/stable-branch/locale/zh-CN/locale-zh.sh +++ b/files/builds/stable-branch/locale/zh-CN/locale-zh.sh @@ -60,7 +60,7 @@ SP_LOGFILE_WINEPREFIX_INFO_TOOLTIP_3="从您的系统中删除当前的 Winepref SP_OS_TITLE="Linux 发行版 - 配置" SP_OS_LABEL_1="在此步骤中，您现在可以选择您的 Linux 发行版来安装安装所需的软件包。" SP_OS_LABEL_2="Linux 发行版：" -SP_OS_SELECT=$(echo "Arch Linux,Debian 10,Debian 11,EndeavourOS,Fedora 35,Fedora 36,Linux Mint 19.x,Linux Mint 20.x,Manjaro Linux,openSUSE Leap 15.3,openSUSE Leap 15.4,openSUSE Tumbleweed,Red Hat Enterprise Linux 8.x,Red Hat Enterprise Linux 9.x,Solus,Ubuntu 18.04,Ubuntu 20.04,Ubuntu 22.04,Void Linux,Gentoo Linux") +SP_OS_SELECT=$(echo "Arch Linux,Debian 10,Debian 11,EndeavourOS,Fedora 35,Fedora 36,Linux Mint 19.x,Linux Mint 20.x,Manjaro Linux,openSUSE Leap 15.3,openSUSE Leap 15.4,openSUSE Tumbleweed,Red Hat Enterprise Linux 8.x,Red Hat Enterprise Linux 9.x,Solus,Ubuntu 18.04,Ubuntu 20.04,Ubuntu 22.04,Ubuntu 23.04,Void Linux,Gentoo Linux") ###############################################################################################################################################################