From 5b1f7fbf2836fad773c8c1ac7b7fc350645459fc Mon Sep 17 00:00:00 2001
From: Hamish West <hamish@hamishwest.xyz>
Date: Thu, 23 Sep 2021 20:48:15 +0930
Subject: [PATCH 1/2] Automate multilib detection on arch

---
 scripts/stable-branch/fusion360-install.sh | 52 +++++++++-------------
 1 file changed, 20 insertions(+), 32 deletions(-)

diff --git a/scripts/stable-branch/fusion360-install.sh b/scripts/stable-branch/fusion360-install.sh
index 981a4f5..3b7a70f 100644
--- a/scripts/stable-branch/fusion360-install.sh
+++ b/scripts/stable-branch/fusion360-install.sh
@@ -491,43 +491,31 @@ esac
 # For the installation of Autodesk Fusion 360 one of the supported Linux distributions must be selected! - Part 2
 
 function archlinux-1 {
-
-HEIGHT=15
-WIDTH=60
-CHOICE_HEIGHT=2
-BACKTITLE="$text_6"
-TITLE="$text_6_1"
-MENU="$text_6_2"
-
-OPTIONS=(1 "$text_6_3"
-         2 "$text_6_4")
-
-CHOICE=$(dialog --clear \
-                --backtitle "$BACKTITLE" \
-                --title "$TITLE" \
-                --menu "$MENU" \
-                $HEIGHT $WIDTH $CHOICE_HEIGHT \
-                "${OPTIONS[@]}" \
-                2>&1 >/dev/tty)
-
-clear
-case $CHOICE in
-        1)
-            archlinux-2 &&
-            select-your-path
-            ;;
-        2)
-            sudo echo "[multilib]" >> /etc/pacman.conf &&
-            sudo echo "Include = /etc/pacman.d/mirrorlist" >> /etc/pacman.conf &&
-            archlinux-2 &&
-            select-your-path
-            ;;
-esac
+    echo "Checking for multilib..."
+    if archlinux-verify-multilib ; then
+        echo "multilib found. Continuing..."
+        archlinux-2 &&
+        select-your-path
+    else
+        echo "Enabling multilib..."
+        sudo echo "[multilib]" >> /etc/pacman.conf &&
+        sudo echo "Include = /etc/pacman.d/mirrorlist" >> /etc/pacman.conf &&
+        archlinux-2 &&
+        select-your-path
+    fi
 }
 
 function archlinux-2 {
    sudo pacman -Sy --needed wine wine-mono wine_gecko winetricks p7zip curl cabextract samba ppp
 }
+
+function archlinux-verify-multilib {
+    if cat /etc/pacman.conf | grep -q '^\[multilib\]$' ; then
+        true
+    else
+        false
+    fi
+}
    
 function debian-based-1 {
     sudo apt-get update &&

From 4476664c8dd782391d22a881c671c09083513131 Mon Sep 17 00:00:00 2001
From: Hamish West <hamish@hamishwest.xyz>
Date: Thu, 23 Sep 2021 20:59:40 +0930
Subject: [PATCH 2/2] Fix pacman.conf edit error

---
 scripts/stable-branch/fusion360-install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/stable-branch/fusion360-install.sh b/scripts/stable-branch/fusion360-install.sh
index 3b7a70f..d5b41b8 100644
--- a/scripts/stable-branch/fusion360-install.sh
+++ b/scripts/stable-branch/fusion360-install.sh
@@ -498,8 +498,8 @@ function archlinux-1 {
         select-your-path
     else
         echo "Enabling multilib..."
-        sudo echo "[multilib]" >> /etc/pacman.conf &&
-        sudo echo "Include = /etc/pacman.d/mirrorlist" >> /etc/pacman.conf &&
+        echo "[multilib]" | sudo tee -a /etc/pacman.conf &&
+        echo "Include = /etc/pacman.d/mirrorlist" | sudo tee -a /etc/pacman.conf &&
         archlinux-2 &&
         select-your-path
     fi