Merge pull request utiasDSL#93 from BeomyeolYu/bug-fix

getpass.getuser() instead of os.getlogin() for Ubuntu/ROS2
WHaoZhai · Jun 13, 2022 · 36da0bf · 36da0bf
2 parents 5634010 + 00fba45
commit 36da0bf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/ros2/src/ros2_gym_pybullet_drones/ros2_gym_pybullet_drones/aviary_wrapper.py b/ros2/src/ros2_gym_pybullet_drones/ros2_gym_pybullet_drones/aviary_wrapper.py
@@ -4,9 +4,12 @@
 It publishes on topic 'obs' and reads from topic 'action'.
 """
 import sys, os  # See: https://github.com/utiasDSL/gym-pybullet-drones/issues/89
+import getpass
 sys.path.append(sys.path[0].replace("ros2/install/ros2_gym_pybullet_drones/lib/ros2_gym_pybullet_drones", ""))
-sys.path.append("/Users/"+os.getlogin()+"/opt/anaconda3/envs/drones/lib/python3.8/site-packages")  # macOS
-# sys.path.append("/home/"+os.getlogin()+"/anaconda3/envs/drones/lib/python3.8/site-packages")  # Ubuntu
+if sys.platform == 'darwin': # macOS
+    sys.path.append("/Users/"+os.getlogin()+"/opt/anaconda3/envs/drones/lib/python3.8/site-packages")  
+elif sys.platform == 'linux': # Ubuntu
+    sys.path.append("/home/"+getpass.getuser()+"/anaconda3/envs/drones/lib/python3.8/site-packages")  
 
 import rclpy
 import numpy as np

diff --git a/ros2/src/ros2_gym_pybullet_drones/ros2_gym_pybullet_drones/random_control.py b/ros2/src/ros2_gym_pybullet_drones/ros2_gym_pybullet_drones/random_control.py
@@ -4,9 +4,12 @@
 It publishes random RPMs on topic 'action'.
 """
 import sys, os  # See: https://github.com/utiasDSL/gym-pybullet-drones/issues/89
+import getpass
 sys.path.append(sys.path[0].replace("ros2/install/ros2_gym_pybullet_drones/lib/ros2_gym_pybullet_drones", ""))
-sys.path.append("/Users/"+os.getlogin()+"/opt/anaconda3/envs/drones/lib/python3.8/site-packages")  # macOS
-# sys.path.append("/home/"+os.getlogin()+"/anaconda3/envs/drones/lib/python3.8/site-packages")  # Ubuntu
+if sys.platform == 'darwin': # macOS
+    sys.path.append("/Users/"+os.getlogin()+"/opt/anaconda3/envs/drones/lib/python3.8/site-packages")  
+elif sys.platform == 'linux': # Ubuntu
+    sys.path.append("/home/"+getpass.getuser()+"/anaconda3/envs/drones/lib/python3.8/site-packages")  
 
 import rclpy
 import random