From 1afccf121e926ed5f6507a18e3165ccaa71725fc Mon Sep 17 00:00:00 2001
From: Joseph <94092417+Jgoodwin64@users.noreply.github.com>
Date: Wed, 20 Dec 2023 01:03:32 -0500
Subject: [PATCH] Update setup.sh

Updated the script to auto install some packages that Ubuntu needs in WSL.
---
 setup.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/setup.sh b/setup.sh
index 2e7f1bc..cb18f36 100644
--- a/setup.sh
+++ b/setup.sh
@@ -9,12 +9,10 @@ sudo dpkg --add-architecture i386
 sudo apt update
 
 # Install various packages
-sudo apt install binutils-mips-n64 gcc-mips-n64 git imagemagick liblua5.4-0 liblua5.4-dev libnustd lua5.4 makemask mpg123 newlib-mips-n64 nodejs n64sdk root-compatibility-environment sfz2n64 sox unzip vtf2png -y
+sudo apt install binutils-mips-n64 gcc-mips-n64 git imagemagick liblua5.4-0 liblua5.4-dev libnustd lua5.4 make makemask mpg123 newlib-mips-n64 nodejs n64sdk root-compatibility-environment sfz2n64 sox unzip vtf2png -y
 
-# Install pipx packages
-sudo apt install pipx -y
-pipx ensurepath --force
-pipx install vpk
+# Ubuntu WSL  needs these for some reason.
+sudo apt-get update && sudo apt-get install libnustd libxfixes3 libxi6 libxkbcommon0 libxxf86vm1 libgl1-mesa-glx -y
 
 # Install Blender and FFmpeg  specific versions via snap
 sudo snap install blender --channel=3.6lts/stable --classic
@@ -26,11 +24,17 @@ echo 'export BLENDER_3_6=/snap/bin/blender' >> ~/.bashrc
 echo 'export PATH=$PATH:/opt/crashsdk/bin' >> ~/.bashrc
 echo 'export ROOT=/etc/n64' >> ~/.bashrc
 
+# Install pipx packages
+sudo apt install pipx -y
+pipx ensurepath --force
+pipx install vpk
+
 # Source the updated .bashrc to apply changes in the current terminal
 source ~/.bashrc
 
 echo "Setup is almost complete. Add the files from the Portal folder to portal64/vpk"
+
 read -p "When complete, press Enter to finish setup."
 
 # Displaying 'Setup complete' message after user input
-echo "Setup complete."
+echo "Setup complete. Please restart the terminal if paths are not updated."