From cda0d229bf26611d2dd0f7e1b9f067ef28c53401 Mon Sep 17 00:00:00 2001
From: henning <henning.gaertner@student.hpi.de>
Date: Wed, 20 Nov 2024 13:56:42 +0100
Subject: [PATCH 1/2] Improve the modularity of the unix_install.sh, add arm
 support, more robust checking for installation of conda

---
 install_scripts/install_unix.sh | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/install_scripts/install_unix.sh b/install_scripts/install_unix.sh
index 2828f504..a34d5ddc 100755
--- a/install_scripts/install_unix.sh
+++ b/install_scripts/install_unix.sh
@@ -2,32 +2,47 @@
 
 ENV_NAME="protzilla"
 CONDA_URL="https://repo.anaconda.com/miniconda/"
-MACOS_MINICONDA="Miniconda3-latest-MacOSX-x86_64.sh"
-LINUX_MINICONDA="Miniconda3-latest-Linux-x86_64.sh"
+MINICONDA_PREFIX="Miniconda3-latest-"
+
 URL_TO_USE=""
-VERSION_TO_USE=""
+SCRIPT_NAME=""
+OS_TO_USE=""
+ARCHITECTURE_TO_USE=""
+
+# check the processor architecture
+if [ "$(uname -m)" == "x86_64" ]; then
+  ARCHITECTURE_TO_USE="x86_64"
+elif [ "$(uname -m)" == "arm64" ]; then
+  ARCHITECTURE_TO_USE="arm64"
+else
+  echo "Architecture not supported."
+  exit 1
+fi
 
 # check if the script is running on macos or linux
 if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-  URL_TO_USE=$CONDA_URL$LINUX_MINICONDA
-  VERSION_TO_USE=$LINUX_MINICONDA
+  OS_TO_USE="Linux"
 elif [[ "$OSTYPE" == "darwin"* ]]; then
-  URL_TO_USE=$CONDA_URL$MACOS_MINICONDA
-  VERSION_TO_USE=$MACOS_MINICONDA
+  OS_TO_USE="MacOSX"
 else
   echo "OS not supported, use the install_windows.sh script (to be written)."
   exit 1
 fi
 
+SCRIPT_NAME="$MINICONDA_PREFIX$OS_TO_USE-$ARCHITECTURE_TO_USE.sh"
+URL_TO_USE="$CONDA_URL$SCRIPT_NAME"
+echo "Downloading $URL_TO_USE"
+
 # Check if some sort of conda is already installed
-if [ -d "$HOME/miniconda3" ] || [ -d "$HOME/miniconda" ] || [ -d "$HOME/anaconda3" ] || [ -d "$HOME/anaconda" ]; then
+if [ -d "$HOME/miniconda3" ] || [ -d "$HOME/miniconda" ] || [ -d "$HOME/anaconda3" ] || [ -d "$HOME/anaconda" ] || command -v conda >/dev/null 2>&1; then
+
   echo "Miniconda or Anaconda are already installed."
   conda init bash
 else
   echo "Installing Miniconda..."
   echo "$URL_TO_USE"
   curl -O $URL_TO_USE
-  bash $VERSION_TO_USE -p "$HOME"/miniconda
+  bash $SCRIPT_NAME -p "$HOME"/miniconda
   export PATH="$HOME/miniconda/bin:$PATH"
   source $HOME/miniconda/bin/activate
   conda config --set auto_activate_base false

From bf2de6d55b89ec8b97812b73cae020ffdc79c418 Mon Sep 17 00:00:00 2001
From: henning <henning.gaertner@student.hpi.de>
Date: Wed, 20 Nov 2024 14:16:46 +0100
Subject: [PATCH 2/2] Add linux aarch64 arm architecture support

---
 install_scripts/install_unix.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/install_scripts/install_unix.sh b/install_scripts/install_unix.sh
index a34d5ddc..5e1b6fab 100755
--- a/install_scripts/install_unix.sh
+++ b/install_scripts/install_unix.sh
@@ -14,6 +14,8 @@ if [ "$(uname -m)" == "x86_64" ]; then
   ARCHITECTURE_TO_USE="x86_64"
 elif [ "$(uname -m)" == "arm64" ]; then
   ARCHITECTURE_TO_USE="arm64"
+elif [ "$(uname -m)" == "aarch64" ]; then
+  ARCHITECTURE_TO_USE="aarch64"
 else
   echo "Architecture not supported."
   exit 1