Merge pull request #55 from ejortega/check_rosetta_status

Check if Rosetta installation is necessary

Author: ichi4096

README.md

@@ -18,7 +18,7 @@ Expect the installation process to last about one to two hours and download ~20
 ### Preparations
 You first need to install [Docker®](https://www.docker.com/products/docker-desktop/) (make sure to choose "Apple Chip" instead of "Intel Chip"). You may find it useful to disable the option "Open Docker Dashboard when Docker Desktop starts".
 
-Rossetta must be installed on your Mac. The installer will ask you to install it if it is not already installed.
+Rosetta must be installed on your Mac. The installer will ask you to install it if it is not already installed.
 
 You will also need the Vivado installer file (the "Linux® Self Extracting Web Installer").
 
@@ -93,7 +93,7 @@ This version of xvcd only supports the FT2232C chip. There are forks of this sof
 ## License, copyright and trademark information
 The repository's contents are licensed under the Creative Commons Zero v1.0 Universal license.
 
-Note that the scripts are configured such that you automatically agree to Xilinx' and 3rd party EULAs (which can be obtained by extracting the installer yourself) by running them. You also automatically agree to [Apple's software licence agreement](https://www.apple.com/legal/sla/) for Rosetta 2.
+Note that the scripts are configured such that you automatically agree to Xilinx' and 3rd party EULAs (which can be obtained by extracting the installer yourself) by running them. You also automatically agree to [Apple's software license agreement](https://www.apple.com/legal/sla/) for Rosetta 2.
 
 If you are installing Vivado version 2021.1:
 - WebTalk data collection is enabled, and you automatically agree to the corresponding terms.

scripts/setup.sh

@@ -28,15 +28,10 @@ f_echo "- Agreeing to Xilinx'/AMD's EULAs (which can be obtained by extracting t
 f_echo "- Enabling WebTalk data collection for version 2021.1 and agreeing to corresponding terms"
 f_echo "- Installation of Rosetta 2 and agreeing to Apple's corresponding software license agreement"
 f_echo "Proceed [Y/n]?"
-read rosetta_install
-case $rosetta_install in
+read user_consent
+case $user_consent in
 [yY]|[yY][eE]*)
-	f_echo "Installing Rosetta..."
-	if ! softwareupdate --install-rosetta --agree-to-license
-	then
-		f_echo "Error installing Rosetta."
-		exit 1
-	fi
+	f_echo "Continuing setup..."
 	;;
 [nN]|[nN][oO]*)
 	f_echo "Aborting setup."
@@ -48,6 +43,22 @@ case $rosetta_install in
 	;;
 esac
 
+# Check if the Mac is Intel or Apple Silicon
+if [[ "$(uname -m)" == "x86_64" ]]; then
+	f_echo "Mac is Intel-based. Rosetta installation is not required."
+else
+	if arch -arch x86_64 uname -m > /dev/null 2>&1; then
+		f_echo "Rosetta is already installed."
+	else
+		f_echo "Rosetta is not installed."
+		f_echo "Proceeding with Rosetta installation..."
+		if ! softwareupdate --install-rosetta --agree-to-license; then
+			f_echo "Error installing Rosetta."
+			exit 1
+		fi
+	fi
+fi
+
 # Get Vivado installation file
 f_echo "You need to put the Vivado installation file into this folder if you have not done so already."
 installation_binary=""