Merge branch 'main' into fix/noise_device_propogation

isaac-sim · Oct 8, 2024 · 14bde30 · 14bde30
2 parents 6c1c4b3 + d18f0c2
commit 14bde30
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/isaaclab.bat b/isaaclab.bat
@@ -81,7 +81,7 @@ if errorlevel 1 (
     set isaacsim_exe=!isaac_path!\isaac-sim.bat
 ) else (
     rem if isaac sim installed from pip
-    set isaacsim_exe=isaacsim
+    set isaacsim_exe=isaacsim omni.isaac.sim
 )
 rem check if there is a python path available
 if not exist "%isaacsim_exe%" (

diff --git a/isaaclab.sh b/isaaclab.sh
@@ -90,8 +90,14 @@ extract_isaacsim_exe() {
     local isaacsim_exe=${isaac_path}/isaac-sim.sh
     # check if there is a python path available
     if [ ! -f "${isaacsim_exe}" ]; then
-        echo "[ERROR] No Isaac Sim executable found at path: ${isaacsim_exe}" >&2
-        exit 1
+        # check for installation using Isaac Sim pip
+        if [ $(python -m pip list | grep -c 'isaacsim-rl') -gt 0 ]; then
+            # Isaac Sim - Python packages entry point
+            local isaacsim_exe="isaacsim omni.isaac.sim"
+        else
+            echo "[ERROR] No Isaac Sim executable found at path: ${isaac_path}" >&2
+            exit 1
+        fi
     fi
     # return the result
     echo ${isaacsim_exe}