updated installation script to utilize the setup script in xrobotoolkit_sdk

Author: zhigenzhao

README.md

@@ -7,7 +7,7 @@ Pico teleoperation demo written in python for both mujoco simulation and robot h
 This project provides a framework for controlling robots in robot hardware and MuJoCo simulation through XR (VR/AR) input devices. It allows users to manipulate robot arms using natural hand movements captured through XR controllers.
 
 ## Installation
-1. Download and install `XRoboToolkit PC Service`
+1. Download and install `XRoboToolkit PC Service` [todo: include .deb package link]
 
 2.  **Clone the repository:**
     ```bash
@@ -16,22 +16,22 @@ This project provides a framework for controlling robots in robot hardware and M
     ```
 
 3.  **Installation**
-    
+    **Note:** The setup scripts are currently only tested on Ubuntu 22.04.
     It is recommended to setup a Conda environment and install the project using the included script.
     ```bash
     bash setup_conda.sh --conda <optional_env_name>
     conda activate <env_name>
     bash setup_conda.sh --install
     ```
 
-    If installing on system python (Ubuntu only):
+    If installing on system python:
     ```bash
     bash setup.sh
     ```
 
-    **Note:** The `setup_conda.sh` script is currently only supported on Ubuntu. For Windows users, please follow these steps:
+    <!-- **Note:** The `setup_conda.sh` script is currently only supported on Ubuntu. For Windows users, please follow these steps:
     1. Manually build the [`xrobotookit_sdk`](https://github.com/XR-Robotics/XRoboToolkit-PC-Service-Pybind).
-    2. Then, install this package using `pip install -e .` in your activated Conda environment or system Python.
+    2. Then, install this package using `pip install -e .` in your activated Conda environment or system Python. -->
 
 ## Usage
 

setup.sh

@@ -11,13 +11,16 @@ if [[ "$OS_NAME" == "Linux" ]]; then
         . /etc/os-release
         OS_VERSION=$VERSION_ID
     fi
-    if [[ "$OS_VERSION" != "22.04" && "$OS_VERSION" != "24.04" ]]; then
-        echo "This script only supports Ubuntu 22.04 or 24.04."
-        exit 1
+    if [[ "$OS_VERSION" != "22.04" ]]; then
+        echo "Warning: This script has only been tested on Ubuntu 22.04"
+        echo "Your system is running Ubuntu $OS_VERSION."
+        read -p "Do you want to continue anyway? (y/N): " -n 1 -r
+        echo
+        if [[ ! $REPLY =~ ^[Yy]$ ]]; then
+            echo "Installation cancelled."
+            exit 1
+        fi
     fi
-elif [[ "$OS_NAME" == "MINGW"* || "$OS_NAME" == "CYGWIN"* || "$OS_NAME" == "MSYS"* ]]; then
-    OS_VERSION="Windows"
-    echo "Windows detected"
 else
     echo "Unsupported operating system: $OS_NAME"
     exit 1
@@ -29,24 +32,12 @@ echo "Operating system check passed: $OS_NAME $OS_VERSION"
     rm -rf dependencies
     mkdir dependencies
     cd dependencies
-    git clone https://github.com/XR-Robotics/XRoboToolkit-PC-Service.git
-    cd XRoboToolkit-PC-Service/RoboticsService/PXREARobotSDK 
-    bash build.sh || { echo "Failed to build PXREARobotSDK"; exit 1; }
-    cd ../../..
 
     git clone https://github.com/XR-Robotics/XRoboToolkit-PC-Service-Pybind.git
     cd XRoboToolkit-PC-Service-Pybind
-    if [[ "$OS_NAME" == "Linux" ]]; then
-        cp ../XRoboToolkit-PC-Service/RoboticsService/PXREARobotSDK/build/libPXREARobotSDK.so lib/ || { echo "Failed to copy libPXREARobotSDK.so"; exit 1; }
-    elif [[ "$OS_NAME" == "MINGW"* || "$OS_NAME" == "CYGWIN"* || "$OS_NAME" == "MSYS"* ]]; then
-        cp ../XRoboToolkit-PC-Service/RoboticsService/PXREARobotSDK/build/PXREARobotSDK.dll lib/ || { echo "Failed to copy PXREARobotSDK.dll"; exit 1; }
-        cp ../XRoboToolkit-PC-Service/RoboticsService/PXREARobotSDK/build/PXREARobotSDK.lib lib/ || { echo "Failed to copy PXREARobotSDK.lib"; exit 1; }
-    fi
-    python setup.py install || { echo "Failed to install xrobotoolkit_sdk"; exit 1; }
-    cd ..
-    rm -rf XRoboToolkit-PC-Service
+    bash setup_ubuntu.sh
 
-    cd ..
+    cd ../..
 
     pip install -e . || { echo "Failed to install xrobotoolkit_teleop with pip"; exit 1; }
 

setup_conda.sh

@@ -11,8 +11,8 @@ if [[ "$OS_NAME" == "Linux" ]]; then
         . /etc/os-release
         OS_VERSION=$VERSION_ID
     fi
-    if [[ "$OS_VERSION" != "22.04" && "$OS_VERSION" != "24.04" ]]; then
-        echo "Warning: This script has only been tested on Ubuntu 22.04 and 24.04."
+    if [[ "$OS_VERSION" != "22.04" ]]; then
+        echo "Warning: This script has only been tested on Ubuntu 22.04"
         echo "Your system is running Ubuntu $OS_VERSION."
         read -p "Do you want to continue anyway? (y/N): " -n 1 -r
         echo
@@ -103,27 +103,17 @@ elif [[ "$1" == "--install" ]]; then
         echo "Unsupported operating system: $OS_NAME"
         exit 1
     fi
-    export CC=/usr/bin/gcc
-    export CXX=/usr/bin/g++
-
 
     # Install the required packages
     rm -rf dependencies
     mkdir dependencies
     cd dependencies
-    git clone https://github.com/XR-Robotics/XRoboToolkit-PC-Service.git
-    cd XRoboToolkit-PC-Service/RoboticsService/PXREARobotSDK 
-    bash build.sh || { echo "Failed to build PXREARobotSDK"; exit 1; }
-    cd ../../..
 
     git clone https://github.com/XR-Robotics/XRoboToolkit-PC-Service-Pybind.git
     cd XRoboToolkit-PC-Service-Pybind
-    cp ../XRoboToolkit-PC-Service/RoboticsService/PXREARobotSDK/build/libPXREARobotSDK.so lib/ || { echo "Failed to copy libPXREARobotSDK.so"; exit 1; }
-    python setup.py install || { echo "Failed to install xrobotoolkit_sdk"; exit 1; }
-    cd ..
-    rm -rf XRoboToolkit-PC-Service
+    bash setup_ubuntu.sh
 
-    cd ..
+    cd ../..
 
     pip install -e . || { echo "Failed to install xrobotoolkit_teleop with pip"; exit 1; }